From 1eff34d1c3b1993cfef7413fb41d9b8059c62d14 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 11 Apr 2006 16:03:28 +0000
Subject: [PATCH] * lib/autotest/general.m4 (_AT_CHECK): Avoid syntax error on
empty check. * tests/autotest.at (Empty test, Empty check): New test to check
it.
---
ChangeLog | 6 +++++-
lib/autotest/general.m4 | 2 +-
tests/autotest.at | 5 +++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a41bbcba..4eea4eda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2006-04-10 Eric Blake <ebb9@byu.net>
+2006-04-11 Eric Blake <ebb9@byu.net>
+
+ * lib/autotest/general.m4 (_AT_CHECK): Avoid syntax error on empty
+ check.
+ * tests/autotest.at (Empty test, Empty check): New test to check it.
* lib/autoconf/c.m4 (AC_C_CONST, AC_C_VOLATILE): Avoid warnings
from gcc.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 798f04e8..f5b88bf4 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1469,7 +1469,7 @@ if test -n "$at_trace_this"; then
grep '^ *+' "$at_stder1" >&2
grep -v '^ *+' "$at_stder1" >"$at_stderr"
else
- ( $1 ) >"$at_stdout" 2>"$at_stderr"
+ ( :; $1 ) >"$at_stdout" 2>"$at_stderr"
at_status=$?
fi
diff --git a/tests/autotest.at b/tests/autotest.at
index 2f5c4fd7..7f917879 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -84,6 +84,11 @@ AT_CHECK_AT([Empty test suite],
[[AT_INIT([empty test suite])
]])
+# Next level of emptiness.
+AT_CHECK_AT_TEST([Empty test], [])
+
+# And finally, an empty check should not cause a syntax error.
+AT_CHECK_AT_TEST([Empty check], [AT_CHECK])
## ----------------------------------------------------- ##
## Newlines and command substitutions in test commands. ##