* tests/Makefile.am.in (TESTS_ENVIRONMENT): Remove definition.
* tests/chgrp/Makefile.am: Likewise.
* tests/chmod/Makefile.am: Likewise.
* tests/chown/Makefile.am: Likewise.
* tests/cp/Makefile.am: Likewise.
* tests/dd/Makefile.am: Likewise.
* tests/du/Makefile.am: Likewise.
* tests/install/Makefile.am: Likewise.
* tests/ln/Makefile.am: Likewise.
* tests/ls/Makefile.am: Likewise.
* tests/misc/Makefile.am: Likewise.
* tests/mkdir/Makefile.am: Likewise.
* tests/mv/Makefile.am: Likewise.
* tests/readlink/Makefile.am: Likewise.
* tests/rm/Makefile.am: Likewise.
* tests/rmdir/Makefile.am: Likewise.
* tests/tail-2/Makefile.am: Likewise.
* tests/touch/Makefile.am: Likewise.
* tests/check.mk (TESTS_ENVIRONMENT) [EXEEXT, EGREP, MAKE, PERL]:
[CONFIG_HEADER, build_programs, host_os, host_triplet, PATH]:
[REPLACE_GETCWD, CU_TEST_NAME]: Add definitions here.
* tests/misc/pwd-long: Use $abs_top_builddir/src, not $BUILD_SRC_DIR.
* tests/dd/skip-seek: Don't use $ENV{PROG}.
* tests/rm/empty-name: Likewise.
* tests/rm/unreadable: Likewise.
* tests/mv/i-1: Likewise.
2007-10-14 Jim Meyering <meyering@redhat.com>
+ Pull all TESTS_ENVIRONMENT settings "up" into tests/check.mk.
+ * tests/Makefile.am.in (TESTS_ENVIRONMENT): Remove definition.
+ * tests/chgrp/Makefile.am: Likewise.
+ * tests/chmod/Makefile.am: Likewise.
+ * tests/chown/Makefile.am: Likewise.
+ * tests/cp/Makefile.am: Likewise.
+ * tests/dd/Makefile.am: Likewise.
+ * tests/du/Makefile.am: Likewise.
+ * tests/install/Makefile.am: Likewise.
+ * tests/ln/Makefile.am: Likewise.
+ * tests/ls/Makefile.am: Likewise.
+ * tests/misc/Makefile.am: Likewise.
+ * tests/mkdir/Makefile.am: Likewise.
+ * tests/mv/Makefile.am: Likewise.
+ * tests/readlink/Makefile.am: Likewise.
+ * tests/rm/Makefile.am: Likewise.
+ * tests/rmdir/Makefile.am: Likewise.
+ * tests/tail-2/Makefile.am: Likewise.
+ * tests/touch/Makefile.am: Likewise.
+ * tests/check.mk (TESTS_ENVIRONMENT) [EXEEXT, EGREP, MAKE, PERL]:
+ [CONFIG_HEADER, build_programs, host_os, host_triplet, PATH]:
+ [REPLACE_GETCWD, CU_TEST_NAME]: Add definitions here.
+ * tests/misc/pwd-long: Use $abs_top_builddir/src, not $BUILD_SRC_DIR.
+ * tests/dd/skip-seek: Don't use $ENV{PROG}.
+ * tests/rm/empty-name: Likewise.
+ * tests/rm/unreadable: Likewise.
+ * tests/mv/i-1: Likewise.
+
Fix a minor typo.
* configure.ac (AC_INIT): Fix a typo (s/9.6/6.9/) that makes a
difference only when running "make dist" without a .git/ subdir.
EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
.PHONY: vc_exe_in_TESTS
# Append this, because automake does the same.
-TESTS_ENVIRONMENT += \
- top_srcdir=$(top_srcdir) \
- PACKAGE_VERSION=$(PACKAGE_VERSION) \
- abs_top_srcdir=$(abs_top_srcdir) \
- abs_top_builddir=$(abs_top_builddir) \
- srcdir=$(srcdir)
+TESTS_ENVIRONMENT = \
+ abs_top_builddir='$(abs_top_builddir)' \
+ abs_top_srcdir='$(abs_top_srcdir)' \
+ built_programs="`$(built_programs)`" \
+ host_os=$(host_os) \
+ host_triplet='$(host_triplet)' \
+ srcdir='$(srcdir)' \
+ top_srcdir='$(top_srcdir)' \
+ CONFIG_HEADER='$(CONFIG_HEADER)' \
+ CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
+ EGREP='$(EGREP)' \
+ EXEEXT='$(EXEEXT)' \
+ MAKE=$(MAKE) \
+ PACKAGE_VERSION=$(PACKAGE_VERSION) \
+ PERL='$(PERL)' \
+ REPLACE_GETCWD=$(REPLACE_GETCWD) \
+ PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH"
TEST_LOGS = $(TESTS:=.log)
recurse
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- host_triplet=$(host_triplet) \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
usage
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
deref \
separator
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
perm cp-HL cp-i special-bits link dir-rm-dest cp-parents deref-slink \
dir-vs-file into-self
EXTRA_DIST = $(TESTS) trailing-slash
-TESTS_ENVIRONMENT = \
- MAKE=$(MAKE) \
- CONFIG_HEADER=$(CONFIG_HEADER) \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- PERL="$(PERL)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PROG=dd
-
TESTS = \
misc not-rewound skip-seek skip-seek2 unblock-sync
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'dd';
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail;
EOF
hard-link 8gb basic restore-wd \
exclude no-x no-deref trailing-slash deref two-args slink
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- PERL="$(PERL)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
trap
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- EXEEXT='$(EXEEXT)' \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
hard-backup target-1 sf-1 misc backup-1
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
stat-vs-dirent x-option
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PERL="$(PERL)" \
- PROG=ls
include $(top_srcdir)/tests/check.mk
built_programs = \
(cd $(top_builddir)/src && MAKEFLAGS= $(MAKE) -s built_programs.list)
-TESTS_ENVIRONMENT = \
- built_programs="`$(built_programs)`" \
- PERL="$(PERL)" \
- BUILD_SRC_DIR="`pwd`/../../src" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- CONFIG_HEADER=$(CONFIG_HEADER) \
- REPLACE_GETCWD=$(REPLACE_GETCWD) \
- host_os=$(host_os)
-
# Do not choose a name that is a shell keyword like 'if', or a
# commonly-used utility like 'cat' or 'test', as the name of a test.
# Otherwise, VPATH builds will fail on hosts like Solaris, since they
}
until (++$i == $n);
-my $build_src_dir = $ENV{BUILD_SRC_DIR};
-$build_src_dir
- or die "$ME: envvar BUILD_SRC_DIR not defined\n";
+my $abs_top_builddir = $ENV{abs_top_builddir};
+$abs_top_builddir
+ or die "$ME: envvar abs_top_builddir not defined\n";
+my $build_src_dir = "$abs_top_builddir/src";
if ($build_src_dir !~ m!^([-+.:/\w]+)$!)
{
warn "$0: skipping this test; odd build source directory name:\n"
writable-under-readonly
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
part-symlink part-rename trailing-slash
EXTRA_DIST = $(TESTS) vfat
-TESTS_ENVIRONMENT = \
- PERL="$(PERL)" \
- EGREP="$(EGREP)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- CONFIG_HEADER=$(CONFIG_HEADER) \
- PROG=mv
include $(top_srcdir)/tests/check.mk
#!/bin/sh
# Make sure a `n' reply to `mv -i...' aborts the move operation.
-# Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005-2007 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'mv';
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail;
EOF
rl-1 can-e can-f can-m
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk
isatty
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- RM=../../src/rm \
- MKDIR=../../src/mkdir \
- CONFIG_HEADER=$(CONFIG_HEADER) \
- PERL="$(PERL)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PROG=rm
include $(top_srcdir)/tests/check.mk
#!/bin/sh
# Make sure that rm -r '' fails.
-# Copyright (C) 1998, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2003, 2005, 2007 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# Turn off localisation of executable's ouput.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'rm';
my @Tests =
(
my $d = "dir-$$";
my $mkdir = {PRE => sub {mkdir $d,0100 or die "$d: $!\n"}};
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'rm';
my @Tests =
(
fail-perm ignore t-slash
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- PERL="$(PERL)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PROG=rmdir
include $(top_srcdir)/tests/check.mk
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- PERL="$(PERL)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PROG=tail
-
TESTS = \
append-only \
tail-n0f \
no-create-missing \
fail-diag dir-1 dangling-symlink empty-file fifo no-rights obsolescent
EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- host_triplet=$(host_triplet) \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
include $(top_srcdir)/tests/check.mk