Batch of testsuite patches - Part 1: pathseps

[Tim Van Holder]

2001-02-11      Tim Van Holder <address@hidden>

        * tests/aclocal.m4: Fix a few typos.  Add PATH_SEPARATOR
        to the list of envvars to ignore.
        * tests/semantics.at: Use ac_path_separator where appropriate.
        * tests/atconfig.in: Set up PATH for tests; moved from...
        * tests/atgeneral.m4: ... here.

Index: aclocal.m4
===================================================================
RCS file: /cvs/autoconf/tests/aclocal.m4,v
retrieving revision 1.14
diff -u -r1.14 aclocal.m4
--- aclocal.m4  2001/02/05 10:16:32     1.14
+++ aclocal.m4  2001/02/11 19:48:28
@@ -3,15 +3,15 @@

 # AC_STATE_SAVE(FILE)
 # ------------------
-# Save the environment, but the variables we are allowed to touch.
+# Save the environment, except for those variables we are allowed to touch.
 # This is to check no test touches the user name space.
 # FIXME: There are surely better ways.  Explore for instance if
 # we can ask help from AC_SUBST.  We have the right to touch what
-# is AC_SUBST.
+# is AC_SUBST'ed.
 # - ^ac_
 #   Autoconf's shell name space.
 # - prefix and exec_prefix
-#   are kept undefined (NONE) until AC_OUTPUT with then sets them to
+#   are kept undefined (NONE) until AC_OUTPUT which then sets them to
 #   `/usr/local' and `${prefix}' for make.
 # - CONFIG_STATUS and DEFS
 #   Set by AC_OUTPUT.
@@ -44,6 +44,7 @@
       [^(host|build|target)(_(alias|cpu|vendor|os))?=],
       [^(cross_compiling)=],
       [^(interpval)=],
+      [^(PATH_SEPARATOR)=],
       [^(f77_(case|underscore))=],
       [^(ALLOCA|GETLOADAVG_LIBS|KMEM_GROUP|NEED_SETGID|POW_LIB)=],
       [^(AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|RANLIB|SET_MAKE|YACC)=],
Index: semantics.at
===================================================================
RCS file: /cvs/autoconf/tests/semantics.at,v
retrieving revision 1.20
diff -u -r1.20 semantics.at
--- semantics.at        2001/02/05 10:16:32     1.20
+++ semantics.at        2001/02/11 19:48:29
@@ -237,7 +237,8 @@
 AT_DATA(configure.ac,
 [[AC_INIT
 pwd=`pwd`
-path=`echo "1:2:3:4:5:6" | sed -e 's,\([[0-9]]\),'"$pwd"'/path/\1,g'`
+p="1${ac_path_separator}2${ac_path_separator}3${ac_path_separator}4${ac_pat
h_separator}5${ac_path_separator}6"
+path=`echo $p | sed -e 's,\([[0-9]]\),'"$pwd"'/path/\1,g'`
 fail=false

 AC_CHECK_PROG(TOOL1, tool, found, not-found, $path)
@@ -284,6 +285,7 @@
 AT_DATA(configure.ac,
 [[AC_INIT
 pwd=`pwd`
-path=`echo "1:2:3:4:5:6" | sed -e 's,\([[0-9]]\),'"$pwd"'/path/\1,g'`
+p="1${ac_path_separator}2${ac_path_separator}3${ac_path_separator}4${ac_pat
h_separator}5${ac_path_separator}6"
+path=`echo $p | sed -e 's,\([[0-9]]\),'"$pwd"'/path/\1,g'`
 fail=false
Index: atconfig.in
===================================================================
RCS file: /cvs/autoconf/tests/atconfig.in,v
retrieving revision 1.8
diff -u -r1.8 atconfig.in
--- atconfig.in 2001/01/16 10:25:58     1.8
+++ atconfig.in 2001/02/11 19:48:29
@@ -1,4 +1,5 @@
-# @configure_input@                                    -*- shell-script -*-
+# -*- shell-script -*-
+# @configure_input@
 # Configurable variable values for building test suites.
 # Copyright 2000 Free Software Foundation, Inc.

@@ -58,6 +59,23 @@
 srcdir='@srcdir@'
 top_srcdir='@top_srcdir@'
 AUTOTEST_PATH='@AUTOTEST_PATH@'
+
+# Set this to have PATH behave predictably on DJGPP
+PATH_SEPARATOR="@PATH_SEPARATOR@"
+
+# Don't take risks: use absolute path names.
+at_path=`pwd`
+at_IFS_save=$IFS
+IFS="@PATH_SEPARATOR@"
+for at_dir in $AUTOTEST_PATH $PATH; do
+  # There might be directories that don't exist, but don't redirect
+  # builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
+  at_dir=`(cd "$at_dir" && pwd) 2>/dev/null`
+  test -n "$at_dir" && at_path="address@hidden@$at_dir"
+done
+IFS=$at_IFS_save
+PATH=$at_path
+export PATH

 # We need GNU m4.
 M4='@M4@'
Index: atgeneral.m4
===================================================================
RCS file: /cvs/autoconf/tests/atgeneral.m4,v
retrieving revision 1.57
diff -u -r1.57 atgeneral.m4
--- atgeneral.m4        2001/01/30 19:29:40     1.57
+++ atgeneral.m4        2001/02/11 19:48:29
@@ -104,20 +104,6 @@
 at_srcdir=`cd "$srcdir" && pwd`
 at_top_srcdir=`cd "$top_srcdir" && pwd`

-# Don't take risks: use absolute path names.
-at_path=`pwd`
-at_IFS_save=$IFS
-IFS=:
-for at_dir in $AUTOTEST_PATH $PATH; do
-  # There might be directories that don't exist, but don't redirect
-  # builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
-  at_dir=`(cd "$at_dir" && pwd) 2>/dev/null`
-  test -n "$at_dir" && at_path=$at_path:$at_dir
-done
-IFS=$at_IFS_save
-PATH=$at_path
-export PATH
-
 test -f atlocal && . ./atlocal

 # -e sets to true