* lib/autotest/general.m4 (AT_INIT): Store quoted variable

assignments in `at_debug_args', so that we put them correctly
in the `run' script.
* tests/autotest.at (Debugging a failed test): Unmark XFAIL.
Reported by Eric Blake.

diff --git a/ChangeLog b/ChangeLog
index 5c750ab2c285a3c963b41806eb34cb64876e7e7d..72abbaccffbc9de57d26bc5cac2bb2f35608adb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autotest/general.m4 (AT_INIT): Store quoted variable
+       assignments in `at_debug_args', so that we put them correctly
+       in the `run' script.
+       * tests/autotest.at (Debugging a failed test): Unmark XFAIL.
+       Reported by Eric Blake.
+
 2006-04-11  Eric Blake  <ebb9@byu.net>
 
        * tests/autotest.at (AT_CHECK_AT): Add new argument, to allow

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index b535f389515cd9570c321dc589f8db9439e4ad39..6ba3d005ef994fb6fce3e20e20e23e51c9537425 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -414,7 +414,7 @@ m4_divert_push([PARSE_ARGS_END])dnl
        eval "$at_envvar='$at_value'"
        export $at_envvar
        # Propagate to debug scripts.
-       at_debug_args="$at_debug_args $at_option"
+       at_debug_args="$at_debug_args $at_envvar='$at_value'"
        ;;
 
      *) echo "$as_me: invalid option: $at_option" >&2

diff --git a/tests/autotest.at b/tests/autotest.at
index ac2a3bae7f01754f2b8386e6fbf077b46f6ad8a5..ca309b11b531c0108fa49312908be0ddec315a77 100644 (file)
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -295,7 +295,7 @@ AT_CHECK([(cd micro-suite.dir/1; ./run)],
 # in via an environment option.
 AT_CHECK_AT_TEST([Debugging a failed test],
   [AT_CHECK([test "$MY_VAR" = "one space" || exit 42])],
-  [:], [1], [], [ignore], [
+  [], [1], [], [ignore], [
 AT_CHECK([(cd micro-suite.dir/1 && ./run MY_VAR='two  spaces')],
          [1], [ignore], [ignore])
 AT_CHECK([(cd micro-suite.dir/1 && ./run MY_VAR='one space')],