Put CU_TEST_NAME in the environment for each test run by "make check".

* Transform all Makefile.am files so that when running "make check",
CU_TEST_NAME is set to the name of the test.  This is so that when I
run valgrind-enabled (--log-file-qualifier=CU_TEST_NAME) "make check"
on the entire package it is more convenient to map a leak or error
found in a valgrind log file back to the offending test.
Use this command:
(echo tests/Makefile.am.in; find tests -name Makefile.am) \
 |xargs perl -pi -e '/^(\s*)PATH=...VG_PATH_PREFIX/ and ' \
   -e 'print $1,q|CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst |,"\\\n"'

46 files changed, 46 insertions, 0 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4a566c257..aaf0a2908 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,7 @@ TESTS = help-version
 TESTS_ENVIRONMENT = \
   all_programs="`$(all_programs)`" \
   PACKAGE_BUGREPORT=$(PACKAGE_BUGREPORT) \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../src$(PATH_SEPARATOR)$$PATH"
 
 EXTRA_DIST = \
diff --git a/tests/Makefile.am.in b/tests/Makefile.am.in
index bcd7d7955..084db44c5 100644
--- a/tests/Makefile.am.in
+++ b/tests/Makefile.am.in
@@ -24,6 +24,7 @@
 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'
diff --git a/tests/chgrp/Makefile.am b/tests/chgrp/Makefile.am
index 606ab4054..6ffa9b753 100644
--- a/tests/chgrp/Makefile.am
+++ b/tests/chgrp/Makefile.am
@@ -12,4 +12,5 @@ TESTS = \
 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"
diff --git a/tests/chmod/Makefile.am b/tests/chmod/Makefile.am
index d1187d083..0eac48639 100644
--- a/tests/chmod/Makefile.am
+++ b/tests/chmod/Makefile.am
@@ -14,4 +14,5 @@ TESTS = \
 
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/chown/Makefile.am b/tests/chown/Makefile.am
index 73bf483df..e452a0110 100644
--- a/tests/chown/Makefile.am
+++ b/tests/chown/Makefile.am
@@ -8,4 +8,5 @@ TESTS = \
   separator
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index efe9de74d..6ddc2a17a 100644
--- a/tests/cp/Makefile.am
+++ b/tests/cp/Makefile.am
@@ -38,4 +38,5 @@ TESTS_ENVIRONMENT =			\
   MAKE=$(MAKE)				\
   abs_top_builddir=$(abs_top_builddir)	\
   CONFIG_HEADER=$(CONFIG_HEADER)	\
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index 74b3d38eb..e0ba2ccf7 100644
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -52,6 +52,7 @@ od-overlap4.E od-overlap5.O od-overlap5.E
 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'
diff --git a/tests/dd/Makefile.am b/tests/dd/Makefile.am
index 7fa694e7f..91ba05d98 100644
--- a/tests/dd/Makefile.am
+++ b/tests/dd/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=dd
 
diff --git a/tests/dircolors/Makefile.am b/tests/dircolors/Makefile.am
index 5db5c9989..41e754e69 100644
--- a/tests/dircolors/Makefile.am
+++ b/tests/dircolors/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=dircolors
 
diff --git a/tests/du/Makefile.am b/tests/du/Makefile.am
index e547b6bbf..152745016 100644
--- a/tests/du/Makefile.am
+++ b/tests/du/Makefile.am
@@ -36,4 +36,5 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PERL="$(PERL)" \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/expr/Makefile.am b/tests/expr/Makefile.am
index ab189f239..e63e4a129 100644
--- a/tests/expr/Makefile.am
+++ b/tests/expr/Makefile.am
@@ -7,5 +7,6 @@ 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" \
   PROG=expr
diff --git a/tests/factor/Makefile.am b/tests/factor/Makefile.am
index c81168d25..a77612944 100644
--- a/tests/factor/Makefile.am
+++ b/tests/factor/Makefile.am
@@ -7,5 +7,6 @@ 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" \
   PROG=factor
diff --git a/tests/fmt/Makefile.am b/tests/fmt/Makefile.am
index 093f813c4..3ed6f7283 100644
--- a/tests/fmt/Makefile.am
+++ b/tests/fmt/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=fmt
 
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 4577309c7..aba767aa8 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -25,6 +25,7 @@ SUITE = suite.at dd.at m4sh.at
 EXTRA_DIST = $(SUITE) testsuite
 
 TESTS_ENVIRONMENT = \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 TESTS = testsuite
diff --git a/tests/head/Makefile.am b/tests/head/Makefile.am
index d0bcffca5..eb6e6ce39 100644
--- a/tests/head/Makefile.am
+++ b/tests/head/Makefile.am
@@ -39,6 +39,7 @@ posix-3.O posix-3.E posix-4.O posix-4.E posix-5.O posix-5.E
 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'
diff --git a/tests/install/Makefile.am b/tests/install/Makefile.am
index b929aeda7..4e262ee9e 100644
--- a/tests/install/Makefile.am
+++ b/tests/install/Makefile.am
@@ -5,4 +5,5 @@ TESTS = trap basic-1 create-leading d-slashdot
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   EXEEXT='$(EXEEXT)' \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 151d2fea3..fe2d5cd5a 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -44,6 +44,7 @@ bigfield.E invalid-j.O invalid-j.E
 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'
diff --git a/tests/ln/Makefile.am b/tests/ln/Makefile.am
index 79bedce31..0f970783c 100644
--- a/tests/ln/Makefile.am
+++ b/tests/ln/Makefile.am
@@ -4,4 +4,5 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 TESTS = 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"
diff --git a/tests/ls-2/Makefile.am b/tests/ls-2/Makefile.am
index 2fc135309..5ea746ed8 100644
--- a/tests/ls-2/Makefile.am
+++ b/tests/ls-2/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=ls
 
diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am
index 804e35061..36d7b4f2c 100644
--- a/tests/ls/Makefile.am
+++ b/tests/ls/Makefile.am
@@ -33,6 +33,7 @@ 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)" \
   PROG=ls
diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
index e45703fea..0ed74e035 100644
--- a/tests/md5sum/Makefile.am
+++ b/tests/md5sum/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=md5sum
 
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 20ebeeb67..4ad145c4b 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -26,6 +26,7 @@ TESTS_ENVIRONMENT = \
   PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PERL="$(PERL)" \
   BUILD_SRC_DIR="`pwd`/../../src" \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=`../../src/basename -- "$$tst"`
 
diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am
index 7f4351655..ab217af47 100644
--- a/tests/mkdir/Makefile.am
+++ b/tests/mkdir/Makefile.am
@@ -7,4 +7,5 @@ TESTS = \
 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/mv/Makefile.am b/tests/mv/Makefile.am
index 0a1f2db2e..dcc6d227f 100644
--- a/tests/mv/Makefile.am
+++ b/tests/mv/Makefile.am
@@ -46,6 +46,7 @@ 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
diff --git a/tests/od/Makefile.am b/tests/od/Makefile.am
index 8e64051a0..21396a96b 100644
--- a/tests/od/Makefile.am
+++ b/tests/od/Makefile.am
@@ -6,6 +6,7 @@ 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"
 
 TESTS = od-N x8
diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am
index 45a0be9ad..f24cc94b1 100644
--- a/tests/pr/Makefile.am
+++ b/tests/pr/Makefile.am
@@ -127,6 +127,7 @@ col-inval.C.E neg-page.O neg-page.E
 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'
diff --git a/tests/readlink/Makefile.am b/tests/readlink/Makefile.am
index b6bbd314a..c6a5945cb 100644
--- a/tests/readlink/Makefile.am
+++ b/tests/readlink/Makefile.am
@@ -4,4 +4,5 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = 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"
diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index f63210025..ff31f7518 100644
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -46,6 +46,7 @@ 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" \
   PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PROG=rm
diff --git a/tests/rmdir/Makefile.am b/tests/rmdir/Makefile.am
index 74cc41ab4..e1c96437e 100644
--- a/tests/rmdir/Makefile.am
+++ b/tests/rmdir/Makefile.am
@@ -8,5 +8,6 @@ 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" \
   PROG=rmdir
diff --git a/tests/seq/Makefile.am b/tests/seq/Makefile.am
index dbc839a04..3af0268b9 100644
--- a/tests/seq/Makefile.am
+++ b/tests/seq/Makefile.am
@@ -7,5 +7,6 @@ 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" \
   PROG=seq
diff --git a/tests/sha1sum/Makefile.am b/tests/sha1sum/Makefile.am
index 06113e394..920dd1a9a 100644
--- a/tests/sha1sum/Makefile.am
+++ b/tests/sha1sum/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=sha1sum
 
diff --git a/tests/shred/Makefile.am b/tests/shred/Makefile.am
index c0047c6a9..190cc4b47 100644
--- a/tests/shred/Makefile.am
+++ b/tests/shred/Makefile.am
@@ -6,6 +6,7 @@ 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"
 
 TESTS = remove exact
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index ead097249..2a91a5cbb 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -67,6 +67,7 @@ nul-tab.E bigfield.O bigfield.E
 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'
diff --git a/tests/stty/Makefile.am b/tests/stty/Makefile.am
index 9d5b184f7..003b7eb13 100644
--- a/tests/stty/Makefile.am
+++ b/tests/stty/Makefile.am
@@ -4,4 +4,5 @@ AUTOMAKE_OPTIONS = 1.2f gnits
 TESTS = row-col-1 basic-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/sum/Makefile.am b/tests/sum/Makefile.am
index e50ae179d..6b6cedd9a 100644
--- a/tests/sum/Makefile.am
+++ b/tests/sum/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=sum
 
diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am
index 915c38a98..b8cc47639 100644
--- a/tests/tac/Makefile.am
+++ b/tests/tac/Makefile.am
@@ -40,6 +40,7 @@ opt-br.O opt-br.E opt-br2.O opt-br2.E
 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'
diff --git a/tests/tail-2/Makefile.am b/tests/tail-2/Makefile.am
index df0dd20f9..e038a1b66 100644
--- a/tests/tail-2/Makefile.am
+++ b/tests/tail-2/Makefile.am
@@ -24,6 +24,7 @@ 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" \
   PROG=tail
 
diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
index 7886e5d76..f969cdf6c 100644
--- a/tests/tail/Makefile.am
+++ b/tests/tail/Makefile.am
@@ -48,6 +48,7 @@ f-pipe-1.O f-pipe-1.E
 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'
diff --git a/tests/tee/Makefile.am b/tests/tee/Makefile.am
index e8b4388fb..c4b8b2993 100644
--- a/tests/tee/Makefile.am
+++ b/tests/tee/Makefile.am
@@ -4,4 +4,5 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = basic dash
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
+  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am
index 5790d1170..fe191eff2 100644
--- a/tests/test/Makefile.am
+++ b/tests/test/Makefile.am
@@ -124,6 +124,7 @@ paren-5.O paren-5.E
 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'
diff --git a/tests/touch/Makefile.am b/tests/touch/Makefile.am
index 6a7554746..aabdb0900 100644
--- a/tests/touch/Makefile.am
+++ b/tests/touch/Makefile.am
@@ -29,4 +29,5 @@ TESTS = \
 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"
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index 97f6f91d8..1d9605aa2 100644
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -52,6 +52,7 @@ fowler-1.O fowler-1.E
 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'
diff --git a/tests/tsort/Makefile.am b/tests/tsort/Makefile.am
index 3f1e3cd52..389cf88ea 100644
--- a/tests/tsort/Makefile.am
+++ b/tests/tsort/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=tsort
 
diff --git a/tests/unexpand/Makefile.am b/tests/unexpand/Makefile.am
index d67ddbf00..6c692bdf3 100644
--- a/tests/unexpand/Makefile.am
+++ b/tests/unexpand/Makefile.am
@@ -6,6 +6,7 @@ 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" \
   PROG=unexpand
 
diff --git a/tests/uniq/Makefile.am b/tests/uniq/Makefile.am
index 965433281..077a1a4e5 100644
--- a/tests/uniq/Makefile.am
+++ b/tests/uniq/Makefile.am
@@ -46,6 +46,7 @@ obs-plus44.O obs-plus44.E obs-plus45.O obs-plus45.E 50.O 50.E 51.O 51.E 52.O \
 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'
diff --git a/tests/wc/Makefile.am b/tests/wc/Makefile.am
index 37d98049f..04dad0276 100644
--- a/tests/wc/Makefile.am
+++ b/tests/wc/Makefile.am
@@ -32,6 +32,7 @@ c2.O c2.E
 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'