Factor out definitions in TESTS_ENVIRONMENT of srcdir, top_srcdir, etc.

tests/check.mk (top_srcdir): Define.
tests/*/Makefile.am: Remove definitions of $(srcdir), $(top_srcdir),
$(abs_top_srcdir), and $(abs_top_builddir), since they're
defined via the included tests/check.mk.

diff --git a/tests/check.mk b/tests/check.mk
index 2b152df98d6a25bb47c8f22c6143c7759375b502..d0437681f7482443011936fc1dc4b557123f26d5 100644 (file)
--- a/tests/check.mk
+++ b/tests/check.mk
@@ -12,6 +12,7 @@ FIXME_hook_this_to_make_distcheck:
 
 # Append this, because automake does the same.
 TESTS_ENVIRONMENT +=                   \
+  top_srcdir=$(top_srcdir)             \
   abs_top_srcdir=$(abs_top_srcdir)     \
   abs_top_builddir=$(abs_top_builddir) \
   srcdir=$(srcdir)

diff --git a/tests/dd/Makefile.am b/tests/dd/Makefile.am
index f474596dbfb91aff86c6de6698d569bfeeac891f..50f1e66d592701af9f43bb64549a811c67433d2e 100644 (file)
--- a/tests/dd/Makefile.am
+++ b/tests/dd/Makefile.am
@@ -3,8 +3,6 @@
 EXTRA_DIST = $(TESTS)
 
 TESTS_ENVIRONMENT = \
-  top_srcdir=$(top_srcdir) \
-  srcdir=$(srcdir) \
   PERL="$(PERL)" \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \

diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am
index 9ef4afa9c0f35a003c501ce37d5a426a24dde06e..9f6e3c7be60c157fa7aa57b558dd631c9162ab31 100644 (file)
--- a/tests/ls/Makefile.am
+++ b/tests/ls/Makefile.am
@@ -27,8 +27,6 @@ TESTS = \
 
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  top_srcdir=$(top_srcdir) \
-  srcdir=$(srcdir) \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PERL="$(PERL)" \

diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 636918c3970d599890ade8e409d6cfac019069a8..e1de08dc7a8ad5db6c076d63eab308e7a0831be7 100644 (file)
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -22,9 +22,6 @@ built_programs = \
 
 TESTS_ENVIRONMENT = \
   built_programs="`$(built_programs)`" \
-  top_srcdir=$(top_srcdir) \
-  abs_top_builddir=$(abs_top_builddir) \
-  abs_top_srcdir=$(abs_top_srcdir) \
   PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PERL="$(PERL)" \
   BUILD_SRC_DIR="`pwd`/../../src" \

diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am
index 2cf08b257d911d09409a7b3cbd2586ad5e2a18ff..252c48fa18790a7e94c461e0e6d575ca43e8bd72 100644 (file)
--- a/tests/mkdir/Makefile.am
+++ b/tests/mkdir/Makefile.am
@@ -4,7 +4,6 @@ TESTS = \
   p-3 p-1 p-2 p-v special-1 perm parents t-slash p-slashdot
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  srcdir=$(srcdir) \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 

diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index 21d3f4db21272d0a844d37a74dbf0659fa11d72f..203fe36a6c22ce96fbc3ce276cddacde92e28277 100644 (file)
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -44,8 +44,6 @@ TESTS_ENVIRONMENT = \
   RM=../../src/rm \
   MKDIR=../../src/mkdir \
   CONFIG_HEADER=$(CONFIG_HEADER) \
-  top_srcdir=$(top_srcdir) \
-  srcdir=$(srcdir) \
   PERL="$(PERL)" \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \

diff --git a/tests/rmdir/Makefile.am b/tests/rmdir/Makefile.am
index 54e30514241f2fc185d161ec269cfe7b557849c6..b473cc457126b7721ac4895f08144b3571dd9c24 100644 (file)
--- a/tests/rmdir/Makefile.am
+++ b/tests/rmdir/Makefile.am
@@ -3,8 +3,6 @@ TESTS = fail-perm ignore t-slash
 
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  top_srcdir=$(top_srcdir) \
-  srcdir=$(srcdir) \
   PERL="$(PERL)" \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \

diff --git a/tests/tail-2/Makefile.am b/tests/tail-2/Makefile.am
index abd603dcd96d78458209f7c2713e5056ecf93573..055168a90131221156e8d67074f622a633da6a2d 100644 (file)
--- a/tests/tail-2/Makefile.am
+++ b/tests/tail-2/Makefile.am
@@ -19,8 +19,6 @@
 EXTRA_DIST = $(TESTS)
 
 TESTS_ENVIRONMENT = \
-  top_srcdir=$(top_srcdir) \
-  srcdir=$(srcdir) \
   PERL="$(PERL)" \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \