* tests/Makefile.am, tests/*/Makefile.am: (TESTS_ENVIRONMENT):

Add $VG_PATH_PREFIX as a prefix to $PATH

diff --git a/ChangeLog b/ChangeLog
index f6817ff1c722935d4b9a05c1b1790a95bc8538bc..c263aeeaaff07e32f2a2c6f2aa4a7f787b2bbbcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-03  Jim Meyering  <jim@meyering.net>
+
+       * tests/Makefile.am, tests/*/Makefile.am: (TESTS_ENVIRONMENT):
+       Add $VG_PATH_PREFIX as a prefix to $PATH
+
+       * tests/envvar-check (vars): Add CDPATH and POSIXLY_CORRECT.
+       * tests/Makefile.am (evar-check): Remove rule.
+       (EXTRA_DIST): Remove .env-warn.
+       * tests/.env-warn: Remove file.  No longer used.
+       Suggestion from Eric Blake.
+
 2006-07-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        * src/system.h: Include <stdint.h> unconditionally, since we

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1fdb71b71fd0cf324f81de83ed80b4c2c1efc36e..8a95efdfe829ba978ac2b27923aff31d99947f31 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,7 @@ TESTS = help-version
 TESTS_ENVIRONMENT = \
   all_programs="`$(all_programs)`" \
   PACKAGE_BUGREPORT=$(PACKAGE_BUGREPORT) \
-  PATH="`pwd`/../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../src$(PATH_SEPARATOR)$$PATH"
 
 EXTRA_DIST = \
   $(TESTS) Coreutils.pm Makefile.am.in README acl envvar-check \

diff --git a/tests/chgrp/Makefile.am b/tests/chgrp/Makefile.am
index eb37abb47beed01b45b32749c60225864de12637..ac6dab5a7789755d11b21a17f0326578af76daa4 100644 (file)
--- a/tests/chgrp/Makefile.am
+++ b/tests/chgrp/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = no-x posix-H basic deref recurse
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/chmod/Makefile.am b/tests/chmod/Makefile.am
index 26e38a7b5b6351a0faca8b974c3980658c3de270..d5af30220b93bcb1919c899d1647f29803ddab7a 100644 (file)
--- a/tests/chmod/Makefile.am
+++ b/tests/chmod/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = octal no-x equals equal-x c-option setgid umask-x usage
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/chown/Makefile.am b/tests/chown/Makefile.am
index 34ea0b61fb3774a61adc0a4e4939c2a60a7b430e..bee0d5423757d96245aadc55907bc3009add6a1b 100644 (file)
--- a/tests/chown/Makefile.am
+++ b/tests/chown/Makefile.am
@@ -7,4 +7,4 @@ TESTS = \
   separator
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index 32c0d58d8d46da608ff53c999459d3f13b040f95..5fa40e4bbe3334d98a806838c22c95de29b7606d 100644 (file)
--- a/tests/cp/Makefile.am
+++ b/tests/cp/Makefile.am
@@ -14,4 +14,4 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   MAKE=$(MAKE) \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index 3d130060974153b38a2352bbc4a5a9f19f2d3679..525ddac1395a8e7658023e716c518d68bf97e1b6 100644 (file)
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -34,7 +34,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 = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 cf1dd4ee0981e6266e757f5daaaf047f3cf0d7bb..7fa694e7fe97d70c565820723bd8c4b1b83780e5 100644 (file)
--- a/tests/dd/Makefile.am
+++ b/tests/dd/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=dd
 
 TESTS = misc not-rewound skip-seek skip-seek2 unblock-sync

diff --git a/tests/dircolors/Makefile.am b/tests/dircolors/Makefile.am
index 3f58876720f5018983ec1f29e825ff82d69494aa..5db5c9989e4ff176ebab875f33ac7e83e7d4894d 100644 (file)
--- a/tests/dircolors/Makefile.am
+++ b/tests/dircolors/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=dircolors
 
 TESTS = simple

diff --git a/tests/du/Makefile.am b/tests/du/Makefile.am
index 593b2244cdc6143e07b908183476677ea23df221..2cfe5ff19f3073bf373031cc16bc7d1f68482e86 100644 (file)
--- a/tests/du/Makefile.am
+++ b/tests/du/Makefile.am
@@ -15,4 +15,4 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/expr/Makefile.am b/tests/expr/Makefile.am
index 9b0783d9936c9463f7e5d51834f92328cc305dbc..ab189f2394970de0acbdda4c38f32b6206615fdd 100644 (file)
--- a/tests/expr/Makefile.am
+++ b/tests/expr/Makefile.am
@@ -7,5 +7,5 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=expr

diff --git a/tests/factor/Makefile.am b/tests/factor/Makefile.am
index fc3f58a0cdcf571ee8367e454ac76964be4d7d1a..c81168d2559c33d90c5fcb2b5280448f0656a4df 100644 (file)
--- a/tests/factor/Makefile.am
+++ b/tests/factor/Makefile.am
@@ -7,5 +7,5 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=factor

diff --git a/tests/fmt/Makefile.am b/tests/fmt/Makefile.am
index b3d43782a2a155e1c19269ad8e6e31105b767d96..093f813c451007f781fc90d9dd4d8a4125188788 100644 (file)
--- a/tests/fmt/Makefile.am
+++ b/tests/fmt/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=fmt
 
 TESTS = basic long-line

diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index b6408b29c53ed54f5f0c9a6025dc3552551ebe9d..e5679eaa61b438a3bca5fd2b51facf4b53e6b2a2 100644 (file)
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -25,7 +25,7 @@ SUITE = suite.at dd.at m4sh.at
 EXTRA_DIST = $(SUITE) testsuite
 
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 TESTS = testsuite
 

diff --git a/tests/head/Makefile.am b/tests/head/Makefile.am
index 83e928481072b004910ebaae0e3bf2251cb1ea12..9fe1ff9d29c8fafea8de5d217c9078fe6ffc3ca3 100644 (file)
--- a/tests/head/Makefile.am
+++ b/tests/head/Makefile.am
@@ -21,7 +21,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 = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 81774a370cc54fce2bb579d43c4acc13baca7333..b929aeda78e9b8c814c44e7629caa0d93f1b2aed 100644 (file)
--- a/tests/install/Makefile.am
+++ b/tests/install/Makefile.am
@@ -5,4 +5,4 @@ TESTS = trap basic-1 create-leading d-slashdot
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   EXEEXT='$(EXEEXT)' \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 41edd1438b31d53a4cdbecc5eb4be5200592491b..2328b3f15c5c3ffdfb202116fa46112c736f44d9 100644 (file)
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -25,7 +25,7 @@ invalid-j.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 46a8141d43ac63dcba7a17d2b9ad9b9995b9e47c..8048a985224fdc63ec9f825156fb6d194bd15fb5 100644 (file)
--- a/tests/ln/Makefile.am
+++ b/tests/ln/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 TESTS = target-1 sf-1 misc backup-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/ls-2/Makefile.am b/tests/ls-2/Makefile.am
index 5884795a6520816442c220fff0a91aa125df0073..2fc13530987a92abd777e8b4b5fcc7dd45279284 100644 (file)
--- a/tests/ls-2/Makefile.am
+++ b/tests/ls-2/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=ls
 
 TESTS = tests

diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am
index b4837126f83b28cd2a05daf85942cfd147b46383..87f20405fcd39b2d2ee0114ee4f8e87cd19c8068 100644 (file)
--- a/tests/ls/Makefile.am
+++ b/tests/ls/Makefile.am
@@ -11,5 +11,5 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=ls

diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
index 731de3e294b09be083c36800cb5588e01977c5c8..e45703feab1fdae2c622ee274f327601617dedaf 100644 (file)
--- a/tests/md5sum/Makefile.am
+++ b/tests/md5sum/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=md5sum
 
 TESTS = basic-1 newline-1

diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 7fe077defc5325c54f2668cc47eb40fe6f5e2051..d74262b8efaf0fcc96e7b62ad0c11ae137bf3566 100644 (file)
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -8,7 +8,7 @@ TESTS_ENVIRONMENT = \
   PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PERL="$(PERL)" \
   BUILD_SRC_DIR="`pwd`/../../src" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=`../../src/basename -- "$$tst"`
 
 # Do not choose a name that is a shell keyword like 'if', or a

diff --git a/tests/mkdir/Makefile.am b/tests/mkdir/Makefile.am
index 49e2d4b3d8888bf15609f83fd3bc946d056f00c2..7512f7b4b4581dd3d73ec88d3925fd5add62d424 100644 (file)
--- a/tests/mkdir/Makefile.am
+++ b/tests/mkdir/Makefile.am
@@ -7,4 +7,4 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   srcdir=$(srcdir) \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am
index 1d86f786e1d999093e5ce7bc159cef42ed6d963a..e9f99ec1c5ef3051076596aaaa56634131b3f6b0 100644 (file)
--- a/tests/mv/Makefile.am
+++ b/tests/mv/Makefile.am
@@ -24,5 +24,5 @@ TESTS = \
 EXTRA_DIST = $(TESTS) setup vfat
 TESTS_ENVIRONMENT = \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=mv

diff --git a/tests/od/Makefile.am b/tests/od/Makefile.am
index c034f2d4ad1cb389fe181786c2f1b6fc3036340f..8e64051a0068cbf55849ea8c83f315b24d99fe65 100644 (file)
--- a/tests/od/Makefile.am
+++ b/tests/od/Makefile.am
@@ -6,6 +6,6 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 54a3e49e5792abb118b12a3b599b9a2602ca3a4a..c253a36f9aa55d069fc637469c320e7a73677b2c 100644 (file)
--- a/tests/pr/Makefile.am
+++ b/tests/pr/Makefile.am
@@ -109,7 +109,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 = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 7a409ffca99d1c3f89ce16155d5b9fbe67bf34d2..b6bbd314a3b95e60b2c1b8f4b7b1172be4eafe5e 100644 (file)
--- a/tests/readlink/Makefile.am
+++ b/tests/readlink/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = rl-1 can-e can-f can-m
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index 00f9227f535a8a23dbf1dbcec1669ec4a219603e..4a5e836dce4e9131b8414b5398eef1857ef27ff0 100644 (file)
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -22,6 +22,6 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  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 795cb1e7edc82b2050ab81a3a7c7c60fb793c303..74cc41ab4418d21e905689ec5b1c805eec4c2d15 100644 (file)
--- a/tests/rmdir/Makefile.am
+++ b/tests/rmdir/Makefile.am
@@ -8,5 +8,5 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=rmdir

diff --git a/tests/seq/Makefile.am b/tests/seq/Makefile.am
index 61181d2d5031b8ff2ac8c68fa0de8d25ce772da6..dbc839a04e975b2c098d38c8273eaebc32d58d35 100644 (file)
--- a/tests/seq/Makefile.am
+++ b/tests/seq/Makefile.am
@@ -7,5 +7,5 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=seq

diff --git a/tests/sha1sum/Makefile.am b/tests/sha1sum/Makefile.am
index 9dbeb61d38480cdb662183bf306589b6d56fb0cd..06113e394b0b21cc5cd2281354dd87e015fa7a73 100644 (file)
--- a/tests/sha1sum/Makefile.am
+++ b/tests/sha1sum/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=sha1sum
 
 TESTS = basic-1 sample-vec

diff --git a/tests/shred/Makefile.am b/tests/shred/Makefile.am
index e0d4a31b651fd77f79df9359863d0e9660da668b..c0047c6a9913f1d25a78dbe152fa5083ef70e4ba 100644 (file)
--- a/tests/shred/Makefile.am
+++ b/tests/shred/Makefile.am
@@ -6,6 +6,6 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 00731d030e3be3b87818f5d46f0c5937678bbeec..1c88ef9ddd24b4f17bfdc3af78432b23d19cb134 100644 (file)
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -49,7 +49,7 @@ nul-tab.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 8efda62abda7b5d4ae4fdade60123c66159e5b8c..9d5b184f7d845815dc0a42483bbead4bd13481c9 100644 (file)
--- a/tests/stty/Makefile.am
+++ b/tests/stty/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.2f gnits
 TESTS = row-col-1 basic-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/sum/Makefile.am b/tests/sum/Makefile.am
index a32b7e0c01af9e883ca300eb931339e289e6085e..e50ae179dc9819e901ea1d76504c3eb4b4b3744c 100644 (file)
--- a/tests/sum/Makefile.am
+++ b/tests/sum/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=sum
 
 TESTS = basic-1 sysv

diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am
index 624636cc90b9cdd997ae9b63eb8894e0287fb701..40b3d10d15b019cad2ca5b27735dee16ced9b2d5 100644 (file)
--- a/tests/tac/Makefile.am
+++ b/tests/tac/Makefile.am
@@ -22,7 +22,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 = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 4316c34b858985c1e09de1094a5322fb7d222654..1a58c75ef71e66843074280d458e25dcb5d85c80 100644 (file)
--- a/tests/tail-2/Makefile.am
+++ b/tests/tail-2/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=tail
 
 TESTS = \

diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
index 345e450127f789ecf490e3f8f8a5a0f3ee4fc41c..8b67c9d8fd62e9246bd9622114e2143dc45e8632 100644 (file)
--- a/tests/tail/Makefile.am
+++ b/tests/tail/Makefile.am
@@ -30,7 +30,7 @@ f-pipe-1.O f-pipe-1.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 059989b0019f505b93f75c45c14d6ac004390577..e8b4388fb6a642f029d87e93adf3d30531b07923 100644 (file)
--- a/tests/tee/Makefile.am
+++ b/tests/tee/Makefile.am
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = basic dash
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am
index 8748a318fec5f06e8597601b50ae5f36fb1cf0d1..8e5edf3cb0ba0fd61e3011f9bf95a2e1b48884fb 100644 (file)
--- a/tests/test/Makefile.am
+++ b/tests/test/Makefile.am
@@ -106,7 +106,7 @@ paren-5.O paren-5.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 ee84a320d2a55d17ac18270bb571364ce1280db1..3c5900fa0f2dc3c7aa5f47a299f5f855f7b7d081 100644 (file)
--- a/tests/touch/Makefile.am
+++ b/tests/touch/Makefile.am
@@ -10,4 +10,4 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   host_triplet=$(host_triplet) \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"

diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index b80ce54359e55a51cfd64a91338e33d51ddfdc4a..0498d7ab608c2af0bff322e8d8943b36f2c025b5 100644 (file)
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -34,7 +34,7 @@ fowler-1.O fowler-1.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 858784dfc462bf3d744d411e9230f83c7fda7036..3f1e3cd525ded8c1fad713f1bd6310a37fc91e10 100644 (file)
--- a/tests/tsort/Makefile.am
+++ b/tests/tsort/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=tsort
 
 TESTS = basic-1

diff --git a/tests/unexpand/Makefile.am b/tests/unexpand/Makefile.am
index 6822d5a01a1c750fa16fbf00fa3ef194eec701f4..d67ddbf00adda6614d1810f300921d6f0a661f70 100644 (file)
--- a/tests/unexpand/Makefile.am
+++ b/tests/unexpand/Makefile.am
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="$(PERL)" \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=unexpand
 
 TESTS = basic-1

diff --git a/tests/uniq/Makefile.am b/tests/uniq/Makefile.am
index 9ffd49db3db536de67b4fc83d6f8ab9b6f9d67e3..052097d453c0a41aa49d77a62c6565cabae96c3a 100644 (file)
--- a/tests/uniq/Makefile.am
+++ b/tests/uniq/Makefile.am
@@ -28,7 +28,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 = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  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 78e0ef936ffb493c90910e04d2f6f4437c633d6e..312c1a8c4162f85542cc94d881a1bcad669ddee0 100644 (file)
--- a/tests/wc/Makefile.am
+++ b/tests/wc/Makefile.am
@@ -14,7 +14,7 @@ c2.O c2.E
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
 TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
 
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'