AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make lightxml and xml log formatting consistent

Browse Source 
For XML logs, an Incident tag with no sub-tags has a space before the
closing slash.  For Light XML logs, this space was missing unless the
-flush command line option was supplied.

Change-Id: I6de2e140f9309f333b5b97ed7f8116e4e727a149
Reviewed-on: http://codereview.qt.nokia.com/3871
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-08-30 19:54:32 +10:00 committed by Qt by Nokia
parent 527317748d
commit b94eba6899
29 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/testlib/qtestlightxmlstreamer.cpp
View File

@ -152,7 +152,7 @@ void QTestLightXmlStreamer::formatBeforeAttributes(const QTestElement *element,
element->attributeValue(QTest::AI_Line));
if( !element->childElements() )
QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s/>\n",
QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s />\n",
element->attributeValue(QTest::AI_Result), buf.constData());
else
QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s>\n",

4
tests/auto/selftests/expected_assert.lightxml
View File

@ -3,10 +3,10 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="testNumber1">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="testNumber2">
<Incident type="fail" file="Unknown file" line="0">

4
tests/auto/selftests/expected_badxml.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="badDataTag">
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp" line="109">
@ -51,5 +51,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_benchlibcallgrind.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="twoHundredMillionInstructions">
<Incident type="pass" file="" line="0">
@ -11,5 +11,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_benchlibeventcounter.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="events">
<Incident type="pass" file="" line="0">
@ -17,5 +17,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_benchliboptions.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="threeEvents">
<Incident type="pass" file="" line="0">
@ -11,5 +11,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_benchlibtickcounter.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="threeBillionTicks">
<Incident type="pass" file="" line="0">
@ -11,5 +11,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_benchlibwalltime.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<ncident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="waitForOneThousand">
<Incident type="pass" file="" line="0">
@ -21,5 +21,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

8
tests/auto/selftests/expected_cmptest.lightxml
View File

@ -3,13 +3,13 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="compare_boolfuncs">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="compare_pointerfuncs">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="compare_tostring">
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/cmptest/tst_cmptest.cpp" line="122">
@ -28,5 +28,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_commandlinedata.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="fiveTablePasses">
<Incident type="pass" file="" line="0">
@ -32,5 +32,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

2
tests/auto/selftests/expected_crashes.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="crash">
<Incident type="fail" file="Unknown file" line="0">

10
tests/auto/selftests/expected_datatable.lightxml
View File

@ -3,16 +3,16 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="singleTestFunction1">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="singleTestFunction2">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="fiveTablePasses">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="fiveTableFailures">
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91">
@ -48,5 +48,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_datetime.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="dateTime">
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datetime/tst_datetime.cpp" line="66">
@ -23,5 +23,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

2
tests/auto/selftests/expected_exceptionthrow.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="throwException">
<Incident type="fail" file="/local/user_builds/qt/4.6/src/testlib/qtestcase.cpp" line="1691">

4
tests/auto/selftests/expected_expectfail.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="expectAndContinue">
<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/expectfail/tst_expectfail.cpp" line="60">
@ -31,5 +31,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

2
tests/auto/selftests/expected_failinit.lightxml
View File

@ -8,5 +8,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

2
tests/auto/selftests/expected_fetchbogus.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="fetchBogus">
<Incident type="fail" file="Unknown file" line="0">

6
tests/auto/selftests/expected_globaldata.lightxml
View File

@ -3,10 +3,10 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="testGlobal">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="skip">
<Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/globaldata/tst_globaldata.cpp" line="128">
@ -26,5 +26,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_longstring.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="failWithLongString">
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/longstring/tst_longstring.cpp" line="67">
@ -19,5 +19,5 @@ Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitu
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_maxwarnings.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="warn">
<Incident type="pass" file="" line="0">
@ -6016,5 +6016,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

6
tests/auto/selftests/expected_multiexec.lightxml
View File

@ -3,11 +3,11 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="nothing">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_singleskip.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="myTest">
<Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/singleskip/tst_singleskip.cpp" line="56">
@ -11,5 +11,5 @@
</Message>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_skip.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="test">
<Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skip/tst_skip.cpp" line="68">
@ -26,5 +26,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

2
tests/auto/selftests/expected_skipinit.lightxml
View File

@ -8,5 +8,5 @@
</Message>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

6
tests/auto/selftests/expected_sleep.lightxml
View File

@ -3,11 +3,11 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="sleep">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

6
tests/auto/selftests/expected_strcmp.lightxml
View File

@ -3,10 +3,10 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="compareCharStars">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="compareByteArray">
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/strcmp/tst_strcmp.cpp" line="88">
@ -47,5 +47,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

8
tests/auto/selftests/expected_subtest.lightxml
View File

@ -3,13 +3,13 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="test1">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="test2">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="test3">
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="157">
@ -45,5 +45,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_warnings.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="testWarnings">
<Incident type="pass" file="" line="0">
@ -39,5 +39,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>

4
tests/auto/selftests/expected_xunit.lightxml
View File

@ -3,7 +3,7 @@
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
</Environment>
<TestFunction name="initTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="testFunc1">
<Incident type="pass" file="" line="0">
@ -48,5 +48,5 @@
</Incident>
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0"/>
<Incident type="pass" file="" line="0" />
</TestFunction>