Make AT_CHECK act like a simple command.

* lib/autotest/general.m4 (_AT_CHECK): Wrap commands in {;}.
* tests/torture.at (AT_CHECK_CONFIG_CREATION_NOWRITE): Test it.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index d11c6db220af3b08a99711472ac8ef53dfe15a8a..cf144bf1c1acc92e97209aee32759212fce3cf44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-04  Eric Blake  <ebb9@byu.net>
+
+       Make AT_CHECK act like a simple command.
+       * lib/autotest/general.m4 (_AT_CHECK): Wrap commands in {;}.
+       * tests/torture.at (AT_CHECK_CONFIG_CREATION_NOWRITE): Test it.
+
 2008-03-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        On MinGW, substitution of CR and 0xFF fails.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index e8ca1dd33b403c034719009b24a65a9d57fe3c55..98cceae7d78b9f7109bdacd7d6a32f7e0d6ecf1b 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1717,7 +1717,7 @@ m4_define([AT_DIFF_STDOUT()],
 #  ( $at_traceon; $1 ) >at-stdout 2>at-stder1
 #
 m4_define([_AT_CHECK],
-[$at_traceoff
+[{ $at_traceoff
 AS_ECHO(["$at_srcdir/AT_LINE: AS_ESCAPE([$1])"])
 echo AT_LINE >"$at_check_line_file"
 
@@ -1739,5 +1739,5 @@ m4_if([$2], [ignore], [at_func_check_skip],
   [at_func_check_status m4_default([$2], [0])]) $at_status "$at_srcdir/AT_LINE"
 AS_IF($at_failed, [$5], [$6])
 $at_failed && at_func_log_failure AT_capture_files
-$at_traceon
+$at_traceon; }
 ])# _AT_CHECK

diff --git a/tests/torture.at b/tests/torture.at
index 60e26d46a3547da8f797dca54c23fc2f513230db..0d7509ee53d0ef8222475c9217279f4e44e30274 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -215,11 +215,8 @@ AT_CHECK_CONFIGURE([what_to_test=var-$1 --no-create])
 # run by root or on w32).
 touch t
 chmod a-w .
-if mv t t1 >/dev/null 2>&1 ; then
-  :
-else
-  AT_CHECK([./config.status var-$1 </dev/null], [1], [ignore], [ignore])
-fi
+mv t t1 >/dev/null 2>&1 \
+  || AT_CHECK([./config.status var-$1 </dev/null], [1], [ignore], [ignore])
 chmod u+w .
 rm -rf t t1
 ])# AT_CHECK_CONFIG_CREATION_NOWRITE