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/Coreutils.pm | |
| parent | 24fb6d91b6b5b460d5d0b4f5c76d4a954f928040 (diff) | |
| download | coreutils-21b5147fd8ee493727e2a3ca17b3bf695c5024d3.tar.xz | |
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/Coreutils.pm')
| -rw-r--r-- | tests/Coreutils.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm index a0c1bba7d..340d11005 100644 --- a/tests/Coreutils.pm +++ b/tests/Coreutils.pm @@ -33,7 +33,7 @@ my @Types = qw (IN IN_PIPE OUT ERR AUX CMP EXIT PRE POST OUT_SUBST my %Types = map {$_ => 1} @Types; my %Zero_one_type = map {$_ => 1} qw (OUT ERR EXIT PRE POST OUT_SUBST ERR_SUBST ENV); -my $srcdir = $ENV{srcdir}; +my $srcdir = "$ENV{srcdir}"; my $Global_count = 1; # When running in a DJGPP environment, make $ENV{SHELL} point to bash. @@ -46,7 +46,7 @@ defined $ENV{DJDIR} # ================ # 'contents' contents only (file name is derived from test name) # {filename => 'contents'} filename and contents -# {filename => undef} filename only -- $(srcdir)/filename must exist +# {filename => undef} filename only -- $(srcdir)/tests/filename must exist # # FIXME: If there is more than one input file, then you can't specify 'REDIR'. # PIPE is still ok. @@ -185,7 +185,7 @@ sub _process_file_spec ($$$$$) # FIXME: put $srcdir in here somewhere warn "$program_name: $test_name: specified file '$file' does" . " not exist\n" - if ! -f "$srcdir/$file"; + if ! -f "$srcdir/tests/$file"; } return $file; |