Mercurial > hg > octave-nkf > gnulib-hg
changeset 13630:dbece3bf692b
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.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 04 Sep 2010 13:46:42 +0200 |
parents | 978ed1b129fb |
children | 59e05a895ba2 |
files | ChangeLog modules/update-copyright-tests modules/vc-list-files-tests tests/test-update-copyright.sh tests/test-vc-list-files-cvs.sh tests/test-vc-list-files-git.sh |
diffstat | 6 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/modules/update-copyright-tests +++ b/modules/update-copyright-tests @@ -9,4 +9,4 @@ Makefile.am: TESTS += test-update-copyright.sh -TESTS_ENVIRONMENT += PATH='$(abs_aux_dir)'$(PATH_SEPARATOR)"$$PATH" +TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'
--- a/modules/vc-list-files-tests +++ b/modules/vc-list-files-tests @@ -12,4 +12,4 @@ 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)'
--- a/tests/test-update-copyright.sh +++ b/tests/test-update-copyright.sh @@ -27,6 +27,9 @@ 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
--- 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
--- 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