* tests/atgeneral.m4 (AT_CHECK): Fix the m4_ifval invocation.

diff --git a/ChangeLog b/ChangeLog
index cf9e8b5670d30c14a69cfe4559886943b7503647..5d1428dba7c062ed70326e3a07c3d8692209bc57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-06  Akim Demaille  <akim@epita.fr>
+
+       * tests/atgeneral.m4 (AT_CHECK): Fix the m4_ifval invocation.
+
 2000-12-06  Akim Demaille  <akim@epita.fr>
 
        * aclang.m4 (AC_LANG): Be `smart': don't issue the sh code if the

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index efc7e11420b9c506362a92079a6a61ef84bffcd5..e95a68342065d8af89a6af4ea383e84be7ccf176 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -427,8 +427,8 @@ echo AT_LINE >at-check-line
 $at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr
 $at_traceon
 $1
-m4_ifval([$2],
-         [at_status=$?
+m4_ifvaln([$2],
+          [at_status=$?
 $at_traceoff
 if test $at_status != $2; then
   $at_verbose "Exit code was $at_status, expected $2" >&6
@@ -437,9 +437,8 @@ dnl Maybe there was an important message to read before it died.
 dnl Preserve exit code 77.
   test $at_status = 77 && exit 77
   exit 1
-fi
-],
-         [$at_traceoff])dnl
+fi],
+          [$at_traceoff])[]dnl
 if $at_check_stds; then
 dnl Restore stdout to fd1 and stderr to fd2.
   exec 1>&5 2>&6

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index efc7e11420b9c506362a92079a6a61ef84bffcd5..e95a68342065d8af89a6af4ea383e84be7ccf176 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -427,8 +427,8 @@ echo AT_LINE >at-check-line
 $at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr
 $at_traceon
 $1
-m4_ifval([$2],
-         [at_status=$?
+m4_ifvaln([$2],
+          [at_status=$?
 $at_traceoff
 if test $at_status != $2; then
   $at_verbose "Exit code was $at_status, expected $2" >&6
@@ -437,9 +437,8 @@ dnl Maybe there was an important message to read before it died.
 dnl Preserve exit code 77.
   test $at_status = 77 && exit 77
   exit 1
-fi
-],
-         [$at_traceoff])dnl
+fi],
+          [$at_traceoff])[]dnl
 if $at_check_stds; then
 dnl Restore stdout to fd1 and stderr to fd2.
   exec 1>&5 2>&6