diff options
46 files changed, 56 insertions, 45 deletions
@@ -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 1fdb71b71..8a95efdfe 100644 --- 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 eb37abb47..ac6dab5a7 100644 --- 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 26e38a7b5..d5af30220 100644 --- 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 34ea0b61f..bee0d5423 100644 --- 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 32c0d58d8..5fa40e4bb 100644 --- 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 3d1300609..525ddac13 100644 --- 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 cf1dd4ee0..7fa694e7f 100644 --- 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 3f5887672..5db5c9989 100644 --- 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 593b2244c..2cfe5ff19 100644 --- 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 9b0783d99..ab189f239 100644 --- 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 fc3f58a0c..c81168d25 100644 --- 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 b3d43782a..093f813c4 100644 --- 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 b6408b29c..e5679eaa6 100644 --- 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 83e928481..9fe1ff9d2 100644 --- 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 81774a370..b929aeda7 100644 --- 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 41edd1438..2328b3f15 100644 --- 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 46a8141d4..8048a9852 100644 --- 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 5884795a6..2fc135309 100644 --- 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 b4837126f..87f20405f 100644 --- 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 731de3e29..e45703fea 100644 --- 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 7fe077def..d74262b8e 100644 --- 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 49e2d4b3d..7512f7b4b 100644 --- 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 1d86f786e..e9f99ec1c 100644 --- 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 c034f2d4a..8e64051a0 100644 --- 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 54a3e49e5..c253a36f9 100644 --- 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 7a409ffca..b6bbd314a 100644 --- 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 00f9227f5..4a5e836dc 100644 --- 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 795cb1e7e..74cc41ab4 100644 --- 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 61181d2d5..dbc839a04 100644 --- 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 9dbeb61d3..06113e394 100644 --- 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 e0d4a31b6..c0047c6a9 100644 --- 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 00731d030..1c88ef9dd 100644 --- 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 8efda62ab..9d5b184f7 100644 --- 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 a32b7e0c0..e50ae179d 100644 --- 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 624636cc9..40b3d10d1 100644 --- 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 4316c34b8..1a58c75ef 100644 --- 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 345e45012..8b67c9d8f 100644 --- 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 059989b00..e8b4388fb 100644 --- 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 8748a318f..8e5edf3cb 100644 --- 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 ee84a320d..3c5900fa0 100644 --- 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 b80ce5435..0498d7ab6 100644 --- 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 858784dfc..3f1e3cd52 100644 --- 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 6822d5a01..d67ddbf00 100644 --- 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 9ffd49db3..052097d45 100644 --- 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 78e0ef936..312c1a8c4 100644 --- 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' |