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.

8 files changed, 1 insertions, 14 deletions

diff --git a/tests/check.mk b/tests/check.mk
index 2b152df98..d0437681f 100644
--- 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 f474596db..50f1e66d5 100644
--- 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 9ef4afa9c..9f6e3c7be 100644
--- 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 636918c39..e1de08dc7 100644
--- 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 2cf08b257..252c48fa1 100644
--- 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 21d3f4db2..203fe36a6 100644
--- 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 54e305142..b473cc457 100644
--- 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 abd603dcd..055168a90 100644
--- 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" \