* tests/aclocal.m4: Fix some typos. Also ignore $PATH_SEPARATOR.

* tests/atconfig.in: Set PATH_SEPARATOR to the proper
path separator.  Set SHELL here...
* tests/atgeneral.m4: ... instead of here.  Use	$PATH_SEPARATOR
when setting AUTOTEST_PATH.  Don't default tests to "all" before
deciding whether the help text is needed.
* tests/semantics.at: Use the correct path separator.

diff --git a/ChangeLog b/ChangeLog
index a0a470223fee9edc99d83165171d67452288b37f..d29a86ed686f4febe2c3864105cdc4eb3f7bf456 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-13  Tim Van Holder <tim.van.holder@pandora.be>
+
+       * tests/aclocal.m4: Fix some typos.  Also ignore $PATH_SEPARATOR.
+       * tests/atconfig.in: Set PATH_SEPARATOR to the proper
+       path separator.  Set SHELL here...
+       * tests/atgeneral.m4: ... instead of here.  Use $PATH_SEPARATOR
+       when setting AUTOTEST_PATH.  Don't default tests to "all" before
+       deciding whether the help text is needed.
+       * tests/semantics.at: Use the correct path separator.
+
 2001-03-13  Tim Van Holder <tim.van.holder@pandora.be>
 
        * doc/autoconf.texi: Expand section on DOS issues.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 106b98122bf909d8baf9d5b18323b111edd87da3..bd552c1008975ab2f8c310bce37ebcf23147e47b 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -154,12 +154,11 @@ while test $[#] -gt 0; do
   shift
 done
 
-test -z "$at_tests" && at_tests=$at_tests_all
-
 # Help message.
 if $at_help; then
   # If tests were specified, display only their title.
-  test -z "$at_tests" && cat <<EOF
+  if test -z "$at_tests"; then
+    cat <<EOF
 Usage: $[0] [[OPTION]]... [[TESTS]]
 
 Run all the tests, or the selected TESTS.
@@ -173,15 +172,21 @@ Options:
 
 Tests:
 EOF
-  # "  1 42  45 " => " (1|42|45): "
-  at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;s/  */|/g'`
-  egrep -e " (${at_tests_pattern}): " <<EOF
+  else
+    # "  1 42  45 " => " (1|42|45): "
+    at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;s/  */|/g'`
+    at_tests_pattern=" (${at_tests_pattern}): "
+  fi
+  egrep -e "$at_tests_pattern" <<EOF
 m4_divert([HELP])dnl Help message inserted here.
 m4_divert([SETUP])dnl
 EOF
   exit 0
 fi
 
+# Tests to run.
+test -z "$at_tests" && at_tests=$at_tests_all
+
 # Use `diff -u' when possible.
 : >empty
 if diff -u empty empty >/dev/null 2>&1; then

diff --git a/tests/aclocal.m4 b/tests/aclocal.m4
index a584c1e585dda2c79338c1a25587a9162513c083..b27b62addd65ccdd86d5637ed445e60fe5030b70 100644 (file)
--- a/tests/aclocal.m4
+++ b/tests/aclocal.m4
@@ -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 @@ m4_defun([AC_STATE_SAVE],
       [^(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)=],

diff --git a/tests/atconfig.in b/tests/atconfig.in
index 292a946ffb3eb4b3f04e307bc648587935d51029..9c5b7c88cd70d8b8802d7e4feeb6907dbba411ce 100644 (file)
--- a/tests/atconfig.in
+++ b/tests/atconfig.in
@@ -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.
 
@@ -59,5 +60,8 @@ srcdir='@srcdir@'
 top_srcdir='@top_srcdir@'
 AUTOTEST_PATH='@AUTOTEST_PATH@'
 
+SHELL=${CONFIG_SHELL-'@SHELL@'}
+PATH_SEPARATOR='@PATH_SEPARATOR@'
+
 # We need GNU m4.
 M4='@M4@'

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 106b98122bf909d8baf9d5b18323b111edd87da3..bd552c1008975ab2f8c310bce37ebcf23147e47b 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -154,12 +154,11 @@ while test $[#] -gt 0; do
   shift
 done
 
-test -z "$at_tests" && at_tests=$at_tests_all
-
 # Help message.
 if $at_help; then
   # If tests were specified, display only their title.
-  test -z "$at_tests" && cat <<EOF
+  if test -z "$at_tests"; then
+    cat <<EOF
 Usage: $[0] [[OPTION]]... [[TESTS]]
 
 Run all the tests, or the selected TESTS.
@@ -173,15 +172,21 @@ Options:
 
 Tests:
 EOF
-  # "  1 42  45 " => " (1|42|45): "
-  at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;s/  */|/g'`
-  egrep -e " (${at_tests_pattern}): " <<EOF
+  else
+    # "  1 42  45 " => " (1|42|45): "
+    at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;s/  */|/g'`
+    at_tests_pattern=" (${at_tests_pattern}): "
+  fi
+  egrep -e "$at_tests_pattern" <<EOF
 m4_divert([HELP])dnl Help message inserted here.
 m4_divert([SETUP])dnl
 EOF
   exit 0
 fi
 
+# Tests to run.
+test -z "$at_tests" && at_tests=$at_tests_all
+
 # Use `diff -u' when possible.
 : >empty
 if diff -u empty empty >/dev/null 2>&1; then

diff --git a/tests/semantics.at b/tests/semantics.at
index c17c1835e8c37e522d32fd8934a7eedac8ec9c87..542a1125f318a3576247f76ea8d0dfb7facaa75a 100644 (file)
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -237,7 +237,8 @@ AT_CHECK_PROGS_PREPARE
 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_path_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,7 +285,8 @@ AT_CHECK_PROGS_PREPARE
 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_path_separator}5${ac_path_separator}6"
+path=`echo $p | sed -e 's,\([[0-9]]\),'"$pwd"'/path/\1,g'`
 fail=false
 
 AC_PATH_PROG(TOOL1, tool, not-found, $path)