vc-list-files: make the stand-alone gnulib test work

* modules/vc-list-files-tests (configure.ac):
Define and AC_SUBST abs_aux_dir.
(Makefile.am) [TESTS_ENVIRONMENT]: Rather than passing
$(abs_top_srcdir) to each script and having each of them
duplicate the work of setting PATH, set PATH here, using
the new variable, abs_aux_dir instead.
* tests/test-vc-list-files-cvs.sh: Don't set PATH here.
* tests/test-vc-list-files-git.sh: Likewise.
Reported by Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index f3b5bf9361064d28d95c58d408d758f19f72d848..b39f3b0f6e67431e3c0ba92c3654818f6cea6ff2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-05-01  Jim Meyering  <meyering@redhat.com>
+
+       vc-list-files: make the stand-alone gnulib test work
+       * modules/vc-list-files-tests (configure.ac):
+       Define and AC_SUBST abs_aux_dir.
+       (Makefile.am) [TESTS_ENVIRONMENT]: Rather than passing
+       $(abs_top_srcdir) to each script and having each of them
+       duplicate the work of setting PATH, set PATH here, using
+       the new variable, abs_aux_dir instead.
+       * tests/test-vc-list-files-cvs.sh: Don't set PATH here.
+       * tests/test-vc-list-files-git.sh: Likewise.
+       Reported by Bruno Haible.
+
 2008-05-01  Bruno Haible  <bruno@clisp.org>
 
        * lib/getndelim2.c (getndelim2): Fix newsize computation during

diff --git a/modules/vc-list-files-tests b/modules/vc-list-files-tests
index d0a423460622268475e3d1394b5224a562cad6c5..2650c444539614cda6b8cf5039aa776f970dbec6 100644 (file)
--- a/modules/vc-list-files-tests
+++ b/modules/vc-list-files-tests
@@ -5,8 +5,10 @@ tests/test-vc-list-files-cvs.sh
 Depends-on:
 
 configure.ac:
+abs_aux_dir=`cd "$ac_aux_dir"; pwd`
+AC_SUBST([abs_aux_dir])
 
 Makefile.am:
 TESTS += test-vc-list-files-git.sh
 TESTS += test-vc-list-files-cvs.sh
-TESTS_ENVIRONMENT += abs_top_srcdir='$(abs_top_srcdir)'
+TESTS_ENVIRONMENT += PATH='$(abs_aux_dir)':"$$PATH"

diff --git a/tests/test-vc-list-files-cvs.sh b/tests/test-vc-list-files-cvs.sh
index 91bdeac629b8f960f81d60e02e1af1b678c1d172..febd13b43f02d3acf1be549b03cfce332e5ea4f8 100755 (executable)
--- a/tests/test-vc-list-files-cvs.sh
+++ b/tests/test-vc-list-files-cvs.sh
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-PATH="$abs_top_srcdir/build-aux":$PATH
-export PATH
-
 tmpdir=vc-cvs-$$
 trap 'st=$?; cd '"`pwd`"' && rm -rf $tmpdir; exit $st' 0
 trap '(exit $?); exit $?' 1 2 13 15

diff --git a/tests/test-vc-list-files-git.sh b/tests/test-vc-list-files-git.sh
index 7fffc8357fbe096c6b5f1f3aa8bf490f3ea3e711..5b8d94fb78656089986bcf45e0efca8c2e44da05 100755 (executable)
--- a/tests/test-vc-list-files-git.sh
+++ b/tests/test-vc-list-files-git.sh
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-PATH="$abs_top_srcdir/build-aux":$PATH
-export PATH
-
 if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then
   compare() { diff -u "$@"; }
 elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then