Fix testsuite program wrapper for whitespace in `pwd`.

The problem here is that the usual mantra is that command
variables can contain arguments, thus we cannot just escape
$AUTOCONF, $AUTOM4TE etc.  The compromise is to put the
$top_builddir/tests directory early in $PATH, so that the
wrappers are found by their plain name.

* tests/wrapper.as: Put $testdir early in $PATH.
(AUTOCONF, AUTOHEADER, AUTOM4TE): Set to plain command names.

diff --git a/ChangeLog b/ChangeLog
index 36cd400b7b19ae698bf7b40fc281ed0e301b49f1..a7e8ae9a426227e0592f1a3e1eeafa777f901770 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-12-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix testsuite program wrapper for whitespace in `pwd`.
+       The problem here is that the usual mantra is that command
+       variables can contain arguments, thus we cannot just escape
+       $AUTOCONF, $AUTOM4TE etc.  The compromise is to put the
+       $top_builddir/tests directory early in $PATH, so that the
+       wrappers are found by their plain name.
+       * tests/wrapper.as: Put $testdir early in $PATH.
+       (AUTOCONF, AUTOHEADER, AUTOM4TE): Set to plain command names.
+
        Proper config.status --file/--header and $srcdir escaping.
        * lib/autoconf/status.m4 (_AC_OUTPUT_MAIN_LOOP): Quote special
        characters in $ac_file_inputs.

diff --git a/tests/wrapper.as b/tests/wrapper.as
index 148dac96895674df57cc7df13cb2188515a19a36..3f313f7115fd4807a965daaa1aa4b7e605152cc0 100644 (file)
--- a/tests/wrapper.as
+++ b/tests/wrapper.as
@@ -1,7 +1,7 @@
 AS_INIT[]dnl                                            -*- shell-script -*-
 # wrapper.as -- running `@wrap_program@' as if it were installed.
 # @configure_input@
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,9 +19,10 @@ AS_INIT[]dnl                                            -*- shell-script -*-
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 testdir='@abs_top_builddir@/tests'
-AUTOCONF=$testdir/autoconf
-AUTOHEADER=$testdir/autoheader
-AUTOM4TE=$testdir/autom4te
+PATH=$testdir$PATH_SEPARATOR$PATH
+AUTOCONF=autoconf
+AUTOHEADER=autoheader
+AUTOM4TE=autom4te
 AUTOM4TE_CFG='@abs_top_builddir@/lib/autom4te.cfg'
 autom4te_perllibdir='@abs_top_srcdir@/lib'
 export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir