Author: rleigh
Date: Wed Jul 12 08:39:36 2017
New Revision: 1801698
URL: http://svn.apache.org/viewvc?rev=1801698&view=rev
Log:
cmake: Add test corrections to align with sanityTest logic
Modified:
xerces/c/trunk/cmake/RunTest.cmake
xerces/c/trunk/samples/CMakeLists.txt
xerces/c/trunk/samples/expected/SAX2Print4.log
xerces/c/trunk/samples/expected/SAX2Print5.log
xerces/c/trunk/samples/expected/StdInParse2.log
xerces/c/trunk/tests/CMakeLists.txt
Modified: xerces/c/trunk/cmake/RunTest.cmake
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/cmake/RunTest.cmake?rev=1801698&r1=1801697&r2=1801698&view=diff
==============================================================================
--- xerces/c/trunk/cmake/RunTest.cmake (original)
+++ xerces/c/trunk/cmake/RunTest.cmake Wed Jul 12 08:39:36 2017
@@ -52,7 +52,7 @@ macro(test_command command)
# Replace timings in output, and convert newlines for safe comparison
file(READ "${OBSERVED_DIR}/${NAME}.log" output)
string(REGEX REPLACE " *[0-9]+ *ms *" "{timing removed}" output "${output}")
- file(WRITE "${OBSERVED_DIR}/${NAME}-mod.log" ${output})
+ file(WRITE "${OBSERVED_DIR}/${NAME}-mod.log" "${output}")
configure_file("${OBSERVED_DIR}/${NAME}-mod.log"
"${OBSERVED_DIR}/${NAME}.log"
@ONLY NEWLINE_STYLE UNIX)
configure_file("${EXPECTED_DIR}/${NAME}.log"
"${OBSERVED_DIR}/${NAME}-exp.log"
Modified: xerces/c/trunk/samples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/CMakeLists.txt?rev=1801698&r1=1801697&r2=1801698&view=diff
==============================================================================
--- xerces/c/trunk/samples/CMakeLists.txt (original)
+++ xerces/c/trunk/samples/CMakeLists.txt Wed Jul 12 08:39:36 2017
@@ -188,7 +188,7 @@ add_xerces_sample_test(DOMPrint3
add_xerces_sample_test(DOMPrint4 COMMAND DOMPrint -wfpp=on -wddc=off
-n -s personal-schema.xml)
add_xerces_sample_test(DOMPrint5 COMMAND DOMPrint -v=never
-xpath=//name personal.xml)
add_xerces_sample_test(StdInParse1 COMMAND StdInParse STDIN personal.xml)
-add_xerces_sample_test(StdInParse2 COMMAND StdInParse STDIN personal.xml)
+add_xerces_sample_test(StdInParse2 COMMAND StdInParse -v=never STDIN
personal.xml)
add_xerces_sample_test(StdInParse3 COMMAND StdInParse STDIN
personal-schema.xml)
add_xerces_sample_test(PParse COMMAND PParse EXPECT_FAIL)
add_xerces_sample_test(PParse1 COMMAND PParse personal.xml)
Modified: xerces/c/trunk/samples/expected/SAX2Print4.log
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/expected/SAX2Print4.log?rev=1801698&r1=1801697&r2=1801698&view=diff
==============================================================================
--- xerces/c/trunk/samples/expected/SAX2Print4.log (original)
+++ xerces/c/trunk/samples/expected/SAX2Print4.log Wed Jul 12 08:39:36 2017
@@ -5,7 +5,7 @@
<xs:annotation>
<xs:documentation>
The schemaLocation of the relevant file is
- "http://www.w3.org/2001/xml.xsd"; however,
+ "http://www.w3.org/2001/xml.xsd";; however,
we don't want to assume people are always
connected to the 'net when playing with this file.
</xs:documentation>
Modified: xerces/c/trunk/samples/expected/SAX2Print5.log
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/expected/SAX2Print5.log?rev=1801698&r1=1801697&r2=1801698&view=diff
==============================================================================
--- xerces/c/trunk/samples/expected/SAX2Print5.log (original)
+++ xerces/c/trunk/samples/expected/SAX2Print5.log Wed Jul 12 08:39:36 2017
@@ -5,7 +5,7 @@
<xs:annotation>
<xs:documentation>
The schemaLocation of the relevant file is
- "http://www.w3.org/2001/xml.xsd"; however,
+ "http://www.w3.org/2001/xml.xsd";; however,
we don't want to assume people are always
connected to the 'net when playing with this file.
</xs:documentation>
Modified: xerces/c/trunk/samples/expected/StdInParse2.log
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/expected/StdInParse2.log?rev=1801698&r1=1801697&r2=1801698&view=diff
==============================================================================
--- xerces/c/trunk/samples/expected/StdInParse2.log (original)
+++ xerces/c/trunk/samples/expected/StdInParse2.log Wed Jul 12 08:39:36 2017
@@ -1 +1 @@
-stdin:{timing removed}(37 elems, 12 attrs, 134 spaces, 134 chars)
+stdin:{timing removed}(37 elems, 12 attrs, 0 spaces, 268 chars)
Modified: xerces/c/trunk/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/CMakeLists.txt?rev=1801698&r1=1801697&r2=1801698&view=diff
==============================================================================
--- xerces/c/trunk/tests/CMakeLists.txt (original)
+++ xerces/c/trunk/tests/CMakeLists.txt Wed Jul 12 08:39:36 2017
@@ -169,7 +169,7 @@ add_xerces_test(XSerializerTest5 COMMAND
add_xerces_test(XSValueTest COMMAND XSValueTest)
add_xerces_test(InitTermTest COMMAND InitTermTest EXPECT_FAIL)
-add_xerces_test(InitTermTest1 COMMAND InitTermTest personal.xml)
+add_xerces_test(InitTermTest1 COMMAND InitTermTest personal.xml)
add_xerces_test(InitTermTest2 COMMAND InitTermTest -n -s
personal-schema.xml)
add_xerces_test(InitTermTest3 COMMAND InitTermTest -n -s -f
personal-schema.xml)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
