Re: 2.63b autotest vs. bison testsuite

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 4/9/2009 6:56 AM:
> However, this patch now makes an empty test fail instead of pass, which
> causes a regression in our testsuite.
> 
> AT_SETUP([empty test])
> AT_CLEANUP
> 
> So I'm working on fixing that.

Done as follows.  I've pushed this and the in-use dir commit.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkneiCEACgkQ84KuGfSFAYDARwCcDnUfP6S/1RdVi007Tarm0uqy
4hMAnAua4byKuDdeXZuTvrmRJpsHM9EV
=jqFA
-----END PGP SIGNATURE-----

>From bd671cbd57c759087b3f3d4c0b3d4c056712063a Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Thu, 9 Apr 2009 10:29:33 -0600
Subject: [PATCH] Fix regression in empty test.

* lib/autotest/general.m4 (AT_SETUP): Prep AT_ingroup for fallback
use in empty test.  Fixes regression introduced 2009-04-06.
(_AT_CHECK): Undo fallback when a test is not empty.
(AT_CLEANUP): Expand AT_ingroup before deleting.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog               |    8 ++++++++
 lib/autotest/general.m4 |    6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9bd856..ae3f755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-09  Eric Blake  <address@hidden>
+
+       Fix regression in empty test.
+       * lib/autotest/general.m4 (AT_SETUP): Prep AT_ingroup for fallback
+       use in empty test.  Fixes regression introduced 2009-04-06.
+       (_AT_CHECK): Undo fallback when a test is not empty.
+       (AT_CLEANUP): Expand AT_ingroup before deleting.
+
 2009-04-09  Paolo Bonzini  <address@hidden>

        Make a less conservative cross-compilation guess for AC_FUNC_UTIME_NULL.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 11a067c..b00c79b 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1738,7 +1738,8 @@ m4_define([AT_COPYRIGHT],
 # The group is testing what DESCRIPTION says.
 _AT_DEFINE_INIT([AT_SETUP],
 [m4_ifdef([AT_ingroup], [m4_fatal([$0: nested AT_SETUP detected])],
-  [m4_define([AT_ingroup])])
+  [m4_define([AT_ingroup], [AS_ECHO(["$at_setup_line"]) >"$at_check_line_file"
+])])
 m4_ifdef([AT_keywords], [m4_undefine([AT_keywords])])
 m4_define([AT_capture_files], [])
 m4_define([AT_line], AT_LINE)
@@ -1799,7 +1800,7 @@ _AT_DEFINE_SETUP([AT_CAPTURE_FILE],
 # ----------
 # Complete a group of related tests.
 _AT_DEFINE_INIT([AT_CLEANUP],
-[m4_ifdef([AT_ingroup], [m4_undefine([AT_ingroup])],
+[m4_ifdef([AT_ingroup], [AT_ingroup[]_m4_undefine([AT_ingroup])],
   [m4_fatal([$0: missing AT_SETUP detected])])dnl
 m4_append([AT_help_all],
 m4_defn([AT_ordinal]);m4_defn([AT_line]);m4_defn([AT_description]);dnl
@@ -2058,6 +2059,7 @@ m4_define([AT_DIFF_STDOUT()],
 # output from multiple concurrent processes, e.g., an inner testsuite
 # with parallel jobs.
 m4_define([_AT_CHECK],
+[m4_define([AT_ingroup])]dnl
 [{ $at_traceoff
 AS_ECHO(["$at_srcdir/AT_LINE: AS_ESCAPE([[$1]])"])
 _AT_DECIDE_TRACEABLE([$1]) "AS_ESCAPE(m4_dquote(AT_LINE))"
-- 
1.6.1.2