Don't augment PATH in TESTS_ENVIRONMENT.

* modules/update-copyright-tests (Makefile.am): In TESTS_ENVIRONMENT,
set abs_aux_dir instead of augmenting PATH.
* modules/vc-list-files-tests (Makefile.am): Likewise.
* tests/test-update-copyright.sh: Augment PATH here.
* tests/test-vc-list-files-cvs.sh: Augment PATH here, through
path_prepend_.
* tests/test-vc-list-files-git.sh: Likewise.

diff --git a/ChangeLog b/ChangeLog
index fbc77f1..8eb7392 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-04  Bruno Haible  <bruno@clisp.org>
+
+       Don't augment PATH in TESTS_ENVIRONMENT.
+       * modules/update-copyright-tests (Makefile.am): In TESTS_ENVIRONMENT,
+       set abs_aux_dir instead of augmenting PATH.
+       * modules/vc-list-files-tests (Makefile.am): Likewise.
+       * tests/test-update-copyright.sh: Augment PATH here.
+       * tests/test-vc-list-files-cvs.sh: Augment PATH here, through
+       path_prepend_.
+       * tests/test-vc-list-files-git.sh: Likewise.
+
 2010-09-04  Jim Meyering  <meyering@redhat.com>
 
        tests: prohibit augmenting PATH via TESTS_ENVIRONMENT

diff --git a/modules/update-copyright-tests b/modules/update-copyright-tests
index 5dc8ee1..3fab6f0 100644 (file)
--- a/modules/update-copyright-tests
+++ b/modules/update-copyright-tests
@@ -9,4 +9,4 @@ AC_SUBST([abs_aux_dir])
 
 Makefile.am:
 TESTS += test-update-copyright.sh
-TESTS_ENVIRONMENT += PATH='$(abs_aux_dir)'$(PATH_SEPARATOR)"$$PATH"
+TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'

diff --git a/modules/vc-list-files-tests b/modules/vc-list-files-tests
index 9177c4e..368a5bf 100644 (file)
--- a/modules/vc-list-files-tests
+++ b/modules/vc-list-files-tests
@@ -12,4 +12,4 @@ AC_SUBST([abs_aux_dir])
 Makefile.am:
 TESTS += test-vc-list-files-git.sh
 TESTS += test-vc-list-files-cvs.sh
-TESTS_ENVIRONMENT += PATH='$(abs_aux_dir)'$(PATH_SEPARATOR)"$$PATH"
+TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'

diff --git a/tests/test-update-copyright.sh b/tests/test-update-copyright.sh
index 09ade03..971f651 100755 (executable)
--- a/tests/test-update-copyright.sh
+++ b/tests/test-update-copyright.sh
@@ -27,6 +27,9 @@ else
   compare() { cmp "$@"; }
 fi
 
+# Ensure the update-copyright program gets found.
+PATH=$abs_aux_dir:$PATH
+
 TMP_BASE=update-copyright.test
 trap 'rm -f $TMP_BASE*' 0 1 2 3 15
 

diff --git a/tests/test-vc-list-files-cvs.sh b/tests/test-vc-list-files-cvs.sh
index 43a3b3f..f9c0fca 100755 (executable)
--- a/tests/test-vc-list-files-cvs.sh
+++ b/tests/test-vc-list-files-cvs.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 : ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ .
+. "$srcdir/init.sh"; path_prepend_ $abs_aux_dir .
 
 tmpdir=vc-cvs
 repo=`pwd`/$tmpdir/repo

diff --git a/tests/test-vc-list-files-git.sh b/tests/test-vc-list-files-git.sh
index 4757625..47892a5 100755 (executable)
--- a/tests/test-vc-list-files-git.sh
+++ b/tests/test-vc-list-files-git.sh
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 : ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ .
+. "$srcdir/init.sh"; path_prepend_ $abs_aux_dir .
 
 tmpdir=vc-git-$$
 GIT_DIR= GIT_WORK_TREE=; unset GIT_DIR GIT_WORK_TREE