From 1deb9358a06e44b923b11a506d5fd727a8c68e25 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 4 Sep 2010 13:46:42 +0200 Subject: [PATCH] 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. --- ChangeLog | 11 +++++++++++ modules/update-copyright-tests | 2 +- modules/vc-list-files-tests | 2 +- tests/test-update-copyright.sh | 3 +++ tests/test-vc-list-files-cvs.sh | 2 +- tests/test-vc-list-files-git.sh | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbc77f132..8eb739206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-09-04 Bruno Haible + + 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 tests: prohibit augmenting PATH via TESTS_ENVIRONMENT diff --git a/modules/update-copyright-tests b/modules/update-copyright-tests index 5dc8ee1c4..3fab6f068 100644 --- 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 9177c4e3c..368a5bfd7 100644 --- 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 09ade03fd..971f651f9 100755 --- 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 43a3b3fd3..f9c0fcaf4 100755 --- 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 . */ : ${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 47576258b..47892a510 100755 --- 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 . */ : ${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 -- 2.11.0