diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-09-02 21:55:12 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-09-05 08:48:29 +0200 |
| commit | 21b5147fd8ee493727e2a3ca17b3bf695c5024d3 (patch) | |
| tree | b14cc2e5d51d761e9c825e0c0dd56f7fdce85cea /tests/sample-test | |
| parent | 24fb6d91b6b5b460d5d0b4f5c76d4a954f928040 (diff) | |
| download | coreutils-21b5147fd8ee493727e2a3ca17b3bf695c5024d3.tar.gz | |
build: don't use recursive make for tests/ subdirectory
* Makefile.am (SUBDIRS): Remove 'tests'.
(include): The '$(top_srcdir)/tests/local.mk' file.
(check-root): Remove this convenience target, it's no longer needed
now that the "real" check-root target once in 'tests/Makefile' will
land in the top-level makefile.
* configure.ac (AC_CONFIG_FILES): Remove 'tests/Makefile'.
* tests/Makefile.am: Rename ...
* tests/local.mk: ... like this, with a lot of adjustments.
* tests/init.cfg: Move ...
* init.cfg: ... here. This is necessary, for a limitation of the
gnulib-provided 'tests/init.sh', which unconditionally look for
'init.cfg' in the $(srcdir) directory.
* tests/*/*.sh: Adjust: expect init.sh to be in '$srcdir/tests',
not in '$srcdir', and extend $PATH with './src', not with '../src'.
* tests/Coreutils.pm: Adjust similarly.
* tests/pr/pr-tests.pl ($pfx): Likewise.
Diffstat (limited to 'tests/sample-test')
| -rw-r--r-- | tests/sample-test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/sample-test b/tests/sample-test index 7d1f6e958..a67a5dd02 100644 --- a/tests/sample-test +++ b/tests/sample-test @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ FIXME # FIXME: skip_if_root_ @@ -24,7 +24,7 @@ print_ver_ FIXME # If used, these must *follow* init.sh. # FIXME: cleanup_() { rm -rf "$other_partition_tmpdir"; } -# FIXME: . "$abs_srcdir/other-fs-tmpdir" +# FIXME: . "$abs_srcdir/tests/other-fs-tmpdir" FIXME > out || fail=1 cat <<\EOF > exp || fail=1 |