summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel E. Denny <jdenny@clemson.edu>2010-02-22 21:52:39 -0500
committerJoel E. Denny <jdenny@clemson.edu>2010-02-22 21:54:34 -0500
commita3d760ef5d7d9bcab78268f5117c39566aa0345c (patch)
tree05747a92a24b46a68c5fea2da9057b4f60e5f7aa
parent22cc8d813ee57c9631e527a31010ab138f9b7e06 (diff)
downloadbison-a3d760ef5d7d9bcab78268f5117c39566aa0345c.tar.gz
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.
-rw-r--r--ChangeLog8
-rw-r--r--tests/output.at6
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fe369d6..0b584595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
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.
M4's output pipe was not being drained upon fatal errors during
diff --git a/tests/output.at b/tests/output.at
index 999ca184..22f125bf 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -138,7 +138,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
])