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

Add $VG_PATH_PREFIX as a prefix to $PATH
2025-09-10 07:59:52 +02:00 · 2006-07-03 12:55:25 +00:00
parent d67693ced9
commit ae87c86b4a
46 changed files with 56 additions and 45 deletions
--- a/11
+++ b/11
@@ -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
--- 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 \
--- 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"
--- 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"
--- 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"
--- 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"
--- 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'

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

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

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

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

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

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

--- 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 = \
--- 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'

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

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

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

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