lib/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2025-08-08 18:22:09 +03:00
Code Activity

build: don't use recursive make for tests/ subdirectory

Browse Source 
* 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.
This commit is contained in:
Stefano Lattarini
2012-09-02 21:55:12 +02:00
committed by Jim Meyering
parent 24fb6d91b6
commit 21b5147fd8
442 changed files with 1264 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Coreutils.pm
View File

@@ -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;