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)

diff --git a/ChangeLog b/ChangeLog
index 8527597c3f7473b1a7240605d81ce8736398e5e1..c03fc6585048a663158b7c2e73f2c6e5ae0d39f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-22  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       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  <jdenny@ces.clemson.edu>
 
        portability: fix several issues with M4 subprocess.
 2010-02-22  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        portability: fix several issues with M4 subprocess.

diff --git a/tests/output.at b/tests/output.at
index 999ca18420ca2621c2f96497b2a56e608c68660b..22f125bf52fa2910d3f19dfe765e83a79925657a 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -138,7 +138,11 @@ foo: {};
 ]])
 
 [cp ]$1[ expout]
 ]])
 
 [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
 ])
 AT_CHECK([[cat $1]], [[0]], [expout])
 AT_CLEANUP
 ])