[PATCH] tests: fix maintainer-xml-check for recent changes.

[Joel E. Denny]

I pushed this to branch-2.4.2, branch-2.5, and master.

>From 890aeb28f63d42f9b287f29e03613ace10d933fc Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Mon, 22 Feb 2010 21:52:39 -0500
Subject: [PATCH] tests: fix maintainer-xml-check for recent changes.

* tests/output.at (AT_CHECK_CONFLICTING_OUTPUT): Use
AT_BISON_CHECK_NO_XML rather than AT_BISON_CHECK because an
output file whose name conflicts with a previous output file
is now never generated.
(cherry picked from commit a3d760ef5d7d9bcab78268f5117c39566aa0345c)
---
 ChangeLog       |    8 ++++++++
 tests/output.at |    6 +++++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 379afe2..b3f2a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-02-22  Joel E. Denny  <address@hidden>
 
+       tests: fix maintainer-xml-check for recent changes.
+       * tests/output.at (AT_CHECK_CONFLICTING_OUTPUT): Use
+       AT_BISON_CHECK_NO_XML rather than AT_BISON_CHECK because an
+       output file whose name conflicts with a previous output file
+       is now never generated.
+
+2010-02-22  Joel E. Denny  <address@hidden>
+
        portability: fix several issues with M4 subprocess.
 
        M4's output pipe was not being drained upon fatal errors during
diff --git a/tests/output.at b/tests/output.at
index bb6d449..564674e 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -146,7 +146,11 @@ foo: {};
 ]])
 
 [cp ]$1[ expout]
-AT_BISON_CHECK([$3 $1], $5, [], [$4])
+# Because an output file name conflict is still a warning, Bison exits
+# with status 0, so AT_BISON_CHECK does not realize that there may be no
+# output file against which to check the XML.  AT_BISON_CHECK_NO_XML
+# avoids that problem.
+AT_BISON_CHECK_NO_XML([$3 $1], $5, [], [$4])
 AT_CHECK([[cat $1]], [[0]], [expout])
 AT_CLEANUP
 ])
-- 
1.5.4.3