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"'

diff --git a/ChangeLog b/ChangeLog
index 84bda39a4ca013493f4b43a4bf60e16e1814c112..da894d391c96922f0636eeeacddaf929491dddc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-01-13  Jim Meyering  <jim@meyering.net>
+
+       * 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"'
+
 2007-01-11  Jim Meyering  <jim@meyering.net>
 
        Avoid a leak in expr's implementation of the ":" (match) operator.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4a566c257614b69496799667e29d1345fbce9163..aaf0a29082e10458bb72c29a0dea5bc2a6a43489 100644 (file)
--- 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 bcd7d7955564bdf8cabd2d4dde58200009895b8f..084db44c53544bb1ea164fd3926f7534448ef54a 100644 (file)
--- 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 606ab4054ab6228c5b6ba5f91f03d7c6cb7f9db1..6ffa9b753915775fdcb28125c533a7ebc34b7da6 100644 (file)
--- 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 d1187d083b72931e8e0d928bb6e544737f3c3556..0eac486390a27b31de604d76f74ff24849aea8bb 100644 (file)
--- 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 73bf483df6b9b3d534bbc4ba8579cf94e3436b9f..e452a011080c975f0b30ea27f482b64f0b23cc31 100644 (file)
--- 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 efe9de74dbf704aca0b0e17df48088c0f503a4ab..6ddc2a17a4eb55303f1ed006e9f825af5e1db633 100644 (file)
--- 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 74b3d38eb3214fd372eea4bdcd10d2a107fe5284..e0ba2ccf783b9609e74c37f241132324c7ed4765 100644 (file)
--- 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 7fa694e7fe97d70c565820723bd8c4b1b83780e5..91ba05d98d5891183257354ed8f6c9e89ac23e77 100644 (file)
--- 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 5db5c9989e4ff176ebab875f33ac7e83e7d4894d..41e754e6970b06e318eb64b204b3fd1e6f54afca 100644 (file)
--- 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 e547b6bbf0876a0f1ae775c49404ef0621747b05..1527450162851669aae131ada237fa2b5268a359 100644 (file)
--- 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 ab189f2394970de0acbdda4c38f32b6206615fdd..e63e4a129128a3452fa64183300e4214fed48df2 100644 (file)
--- 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 c81168d2559c33d90c5fcb2b5280448f0656a4df..a77612944c09bf0edaf07055555061dd664a1637 100644 (file)
--- 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 093f813c451007f781fc90d9dd4d8a4125188788..3ed6f72838433c4789745ec4c16ced8cad32782e 100644 (file)
--- 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 4577309c741041dea0b4f7f6d11885cada94bb4b..aba767aa825efdd902302ce9764982ad3e36af59 100644 (file)
--- 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 d0bcffca52f26236a0f8b4c5c2aba79485516ace..eb6e6ce3971c67e9aae0f0d63b30ec98d26043f9 100644 (file)
--- 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 b929aeda78e9b8c814c44e7629caa0d93f1b2aed..4e262ee9eabb0446d3f043bb7604fabdc4512e99 100644 (file)
--- 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 151d2fea383f82a2880f06915543e0e471097cbc..fe2d5cd5a741e59c502ae9584b65fd8d6f2279d8 100644 (file)
--- 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 79bedce31f475580900aa635004373dd785e7a57..0f970783cbeb4bc320e0971c00488ea3d4a34e90 100644 (file)
--- 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 2fc13530987a92abd777e8b4b5fcc7dd45279284..5ea746ed8518402e8815a3538e6072ce11179bdd 100644 (file)
--- 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 804e35061b78c82aed9ab2d8c5dc82a3141a3e97..36d7b4f2c1f388c87cd55ec600a4af93d219b6fa 100644 (file)
--- 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 e45703feab1fdae2c622ee274f327601617dedaf..0ed74e03596c6cb50cdd497d54e7f6334f3cfc47 100644 (file)
--- 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 20ebeeb677f5b1afdf119a13651bbbd7b4c06ce0..4ad145c4bcee87bdb2bb234325585fbbb21d2779 100644 (file)
--- 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 7f4351655d9334a9487e5e596e515c05387e4d32..ab217af474fc1f26c621d8879324eb243b0fdf22 100644 (file)
--- 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 0a1f2db2e754369ad6a431022903f6e493a1974b..dcc6d227f32de3a3971f4d478f221d9f5527aa79 100644 (file)
--- 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 8e64051a0068cbf55849ea8c83f315b24d99fe65..21396a96bb6adddfb4aff56137494f37cdc46337 100644 (file)
--- 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 45a0be9adf2efdaa7a8183f9f0a55b5e39031114..f24cc94b194fe2920ead49748d974fba6549d45c 100644 (file)
--- 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 b6bbd314a3b95e60b2c1b8f4b7b1172be4eafe5e..c6a5945cb9f3f1e7d3765f0e9ad6ead4dd06c029 100644 (file)
--- 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 f63210025cdd230f9bec9e9d876cd140b285bc69..ff31f7518c60cfed058c3885b9095b5a73b3d10e 100644 (file)
--- 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 74cc41ab4418d21e905689ec5b1c805eec4c2d15..e1c96437e0f5450c5a057dd36e71c65d2df33f26 100644 (file)
--- 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 dbc839a04e975b2c098d38c8273eaebc32d58d35..3af0268b903713f2227af60fafb820e45c89950a 100644 (file)
--- 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 06113e394b0b21cc5cd2281354dd87e015fa7a73..920dd1a9a50b60027b3377d2fffe3d055a0b16fc 100644 (file)
--- 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 c0047c6a9913f1d25a78dbe152fa5083ef70e4ba..190cc4b4768e3e966b9d3bdea2e2baa0486f7a23 100644 (file)
--- 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 ead09724945bdb12779c2cd10df65c5ce6e41733..2a91a5cbb7be09dbf02cff58ed400fc5c6842746 100644 (file)
--- 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 9d5b184f7d845815dc0a42483bbead4bd13481c9..003b7eb1388ab702dfd60b6a810b01348500516f 100644 (file)
--- 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 e50ae179dc9819e901ea1d76504c3eb4b4b3744c..6b6cedd9a4be86662c0c0e198cce4a337cbf3489 100644 (file)
--- 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 915c38a98d5813ee48c5a54ac5f29aa6f4a44ab2..b8cc476399661d20f1c2e2bae436e5471417ff4e 100644 (file)
--- 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 df0dd20f97bd0eaad27ad9cdf9e36e76302d6145..e038a1b666beff80a376b1362344b4f31a8a9774 100644 (file)
--- 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 7886e5d76ca5896a1606541c51275f6cc3684d52..f969cdf6cc79695631fadbdf89b7765390385357 100644 (file)
--- 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 e8b4388fb6a642f029d87e93adf3d30531b07923..c4b8b2993bdb20cb3ce7f28382eadf5cb6931da1 100644 (file)
--- 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 5790d11701db62297dc0efc9be33723af66d5ff6..fe191eff2c027ec2190c3bdccdf3aa04efcfd87a 100644 (file)
--- 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 6a755474609efe6c8840bfb02485e24e3e10d105..aabdb0900119b7449fb24d046b14ecbf86db5827 100644 (file)
--- 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 97f6f91d8b39894a74f54b926aa16d78cab4311f..1d9605aa2cb432a5f4aa0ed06a30e3891c9ae1a6 100644 (file)
--- 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 3f1e3cd525ded8c1fad713f1bd6310a37fc91e10..389cf88eab34928297fac12e2326518b5351f6f9 100644 (file)
--- 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 d67ddbf00adda6614d1810f300921d6f0a661f70..6c692bdf3e5acfb35dcdc979cffa5f5521c20d14 100644 (file)
--- 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 9654332818a3c1f9eed020a8c4945d0ea54bc943..077a1a4e5d83479631d075c625b71b622d2ac9f3 100644 (file)
--- 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 37d98049fed3152bd0919e5757603ccf58ad2310..04dad0276e8cac67b06e326275898aad7cdc3ff0 100644 (file)
--- 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'