[xiph-commits] r3565 - libcmml/trunk/tests
conrad at svn.annodex.net
conrad at svn.annodex.net
Thu Apr 24 09:22:12 PDT 2008
Author: conrad
Date: 2008-04-24 09:22:12 -0700 (Thu, 24 Apr 2008)
New Revision: 3565
Added:
libcmml/trunk/tests/error1.cmml.stderr
libcmml/trunk/tests/error10.cmml.stderr
libcmml/trunk/tests/error11.cmml.stderr
libcmml/trunk/tests/error12.cmml.stderr
libcmml/trunk/tests/error13.cmml.stderr
libcmml/trunk/tests/error14.cmml.stderr
libcmml/trunk/tests/error15.cmml.stderr
libcmml/trunk/tests/error2.cmml.stderr
libcmml/trunk/tests/error3.cmml.stderr
libcmml/trunk/tests/error4.cmml.stderr
libcmml/trunk/tests/error5.cmml.stderr
libcmml/trunk/tests/error6.cmml.stderr
libcmml/trunk/tests/error7.cmml.stderr
libcmml/trunk/tests/error8.cmml.stderr
libcmml/trunk/tests/error9.cmml.stderr
libcmml/trunk/tests/i18n.cmml.stderr
libcmml/trunk/tests/simple.cmml.stderr
Modified:
libcmml/trunk/tests/Makefile.am
libcmml/trunk/tests/error10.cmml.correct
libcmml/trunk/tests/error11.cmml.correct
libcmml/trunk/tests/error12.cmml.correct
libcmml/trunk/tests/error13.cmml.correct
libcmml/trunk/tests/error14.cmml.correct
libcmml/trunk/tests/error15.cmml.correct
libcmml/trunk/tests/error2.cmml.correct
libcmml/trunk/tests/error3.cmml.correct
libcmml/trunk/tests/error4.cmml.correct
libcmml/trunk/tests/error5.cmml.correct
libcmml/trunk/tests/error6.cmml.correct
libcmml/trunk/tests/error7.cmml.correct
libcmml/trunk/tests/error8.cmml.correct
libcmml/trunk/tests/error9.cmml.correct
Log:
check differences from cmml-validate's stdout and stderr separately in
tests/Makefile.am, as the two could be arbitrarily interleaved if 2>&1
is used.
Modified: libcmml/trunk/tests/Makefile.am
===================================================================
--- libcmml/trunk/tests/Makefile.am 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/Makefile.am 2008-04-24 16:22:12 UTC (rev 3565)
@@ -60,17 +60,19 @@
@echo "---------------------------------------------------------------"; \
for i in $(SRC_CMML) ; do \
if test ${TESTSDIR}/$$i ; then \
- ${TOOLSDIR}/cmml-validate -b ${TESTSDIR}/$$i 2>&1 | diff -b - ${TESTSDIR}/$${i}.correct; \
+ ${TOOLSDIR}/cmml-validate -b ${TESTSDIR}/$$i 2>c.stderr | diff -ub - ${TESTSDIR}/$${i}.correct && diff -ub c.stderr ${TESTSDIR}/$${i}.stderr; \
if test $$? -ne 0 ; then \
echo "---------------------------------------------------------------"; \
echo " libcmml: error in $$i"; \
echo "---------------------------------------------------------------"; \
+ $(RM) c.stderr; \
exit 1; \
else \
echo " $${i} ... passed"; \
fi; \
fi; \
done; \
+ $(RM) c.stderr; \
echo "---------------------------------------------------------------"; \
echo " libcmml passed tests."; \
echo "---------------------------------------------------------------"
Added: libcmml/trunk/tests/error1.cmml.stderr
===================================================================
Modified: libcmml/trunk/tests/error10.cmml.correct
===================================================================
--- libcmml/trunk/tests/error10.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error10.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error10.cmml:16:0: Multiple head tags not allowed
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error10.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error10.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error10.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error10.cmml:16:0: Multiple head tags not allowed
Modified: libcmml/trunk/tests/error11.cmml.correct
===================================================================
--- libcmml/trunk/tests/error11.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error11.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error11.cmml:6:0: Skipped implied attribute of wrong format
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error11.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error11.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error11.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error11.cmml:6:0: Skipped implied attribute of wrong format
Modified: libcmml/trunk/tests/error12.cmml.correct
===================================================================
--- libcmml/trunk/tests/error12.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error12.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error12.cmml:7:0: Skipped unknown tag
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error12.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error12.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error12.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error12.cmml:7:0: Skipped unknown tag
Modified: libcmml/trunk/tests/error13.cmml.correct
===================================================================
--- libcmml/trunk/tests/error13.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error13.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error13.cmml:7:0: Skipped doubly defined tag or tag with missing required attribute
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error13.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error13.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error13.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error13.cmml:7:0: Skipped doubly defined tag or tag with missing required attribute
Modified: libcmml/trunk/tests/error14.cmml.correct
===================================================================
--- libcmml/trunk/tests/error14.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error14.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,2 +1 @@
-error14.cmml:4:0: Skipped xmlns in cmml tag wrongly redefined
Copied: libcmml/trunk/tests/error14.cmml.stderr (from rev 3555, libcmml/trunk/tests/error14.cmml.correct)
===================================================================
--- libcmml/trunk/tests/error14.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error14.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error14.cmml:4:0: Skipped xmlns in cmml tag wrongly redefined
Modified: libcmml/trunk/tests/error15.cmml.correct
===================================================================
--- libcmml/trunk/tests/error15.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error15.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error15.cmml:26:0: Skipped clip out of temporal order
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error15.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error15.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error15.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error15.cmml:26:0: Skipped clip out of temporal order
Modified: libcmml/trunk/tests/error2.cmml.correct
===================================================================
--- libcmml/trunk/tests/error2.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error2.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error2.cmml:22:0: Error formatting time
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error2.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error2.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error2.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error2.cmml:22:0: Error formatting time
Modified: libcmml/trunk/tests/error3.cmml.correct
===================================================================
--- libcmml/trunk/tests/error3.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error3.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error3.cmml:24:0: Expat error parsing CMML filenot well-formed (invalid token)
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error3.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error3.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error3.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error3.cmml:24:0: Expat error parsing CMML filenot well-formed (invalid token)
Modified: libcmml/trunk/tests/error4.cmml.correct
===================================================================
--- libcmml/trunk/tests/error4.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error4.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error4.cmml:17:0: Error parsing CMML file
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error4.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error4.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error4.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error4.cmml:17:0: Error parsing CMML file
Modified: libcmml/trunk/tests/error5.cmml.correct
===================================================================
--- libcmml/trunk/tests/error5.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error5.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,2 +1 @@
-error5.cmml:4:0: cmml tag missing
Copied: libcmml/trunk/tests/error5.cmml.stderr (from rev 3555, libcmml/trunk/tests/error5.cmml.correct)
===================================================================
--- libcmml/trunk/tests/error5.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error5.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error5.cmml:4:0: cmml tag missing
Modified: libcmml/trunk/tests/error6.cmml.correct
===================================================================
--- libcmml/trunk/tests/error6.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error6.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error6.cmml:10:0: head tag missing
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error6.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error6.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error6.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error6.cmml:10:0: head tag missing
Modified: libcmml/trunk/tests/error7.cmml.correct
===================================================================
--- libcmml/trunk/tests/error7.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error7.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error7.cmml:23:0: head or clip tag before stream tag not allowed
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error7.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error7.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error7.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error7.cmml:23:0: head or clip tag before stream tag not allowed
Modified: libcmml/trunk/tests/error8.cmml.correct
===================================================================
--- libcmml/trunk/tests/error8.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error8.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error8.cmml:34:0: head tag after clip tag not allowed
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error8.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error8.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error8.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error8.cmml:34:0: head tag after clip tag not allowed
Modified: libcmml/trunk/tests/error9.cmml.correct
===================================================================
--- libcmml/trunk/tests/error9.cmml.correct 2008-04-24 16:18:23 UTC (rev 3564)
+++ libcmml/trunk/tests/error9.cmml.correct 2008-04-24 16:22:12 UTC (rev 3565)
@@ -1,4 +1,3 @@
-error9.cmml:10:0: Multiple stream tags not allowed
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE cmml SYSTEM "cmml.dtd">
Added: libcmml/trunk/tests/error9.cmml.stderr
===================================================================
--- libcmml/trunk/tests/error9.cmml.stderr (rev 0)
+++ libcmml/trunk/tests/error9.cmml.stderr 2008-04-24 16:22:12 UTC (rev 3565)
@@ -0,0 +1 @@
+error9.cmml:10:0: Multiple stream tags not allowed
Added: libcmml/trunk/tests/i18n.cmml.stderr
===================================================================
Added: libcmml/trunk/tests/simple.cmml.stderr
===================================================================
More information about the commits
mailing list