summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-05-06 01:00:59 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-05-06 01:06:15 (GMT)
commit548da9a5434d615456a7a6efda3380b7138c6000 (patch)
tree6d18ed948721366bff8f12072cd5c81c2b455d8f
parent826bc847e6601f834a3ece8c001a8dd2bfa2fe97 (diff)
downloadQt-548da9a5434d615456a7a6efda3380b7138c6000.zip
Qt-548da9a5434d615456a7a6efda3380b7138c6000.tar.gz
Qt-548da9a5434d615456a7a6efda3380b7138c6000.tar.bz2
Fixed failure of tst_Selftests::checkXML.
A few tests use printf, which means they interfere with the XML test logging. Blacklist them for the XML test. Note that these tests happened to pass under the old test logger implementation. That was because the test logger always printed XML tags on a single line, and the printf calls contained no special XML characters. The test logs generated were technically valid XML but contained extraneous text.
-rw-r--r--tests/auto/selftests/tst_selftests.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index d4069b1..603e730 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -307,13 +307,12 @@ void tst_Selftests::initTestCase()
m_checkXMLBlacklist.append("qexecstringlist");
m_checkXMLBlacklist.append("benchliboptions");
+ /* These tests use printf and therefore corrupt the testlog */
+ m_checkXMLBlacklist.append("subtest");
+ m_checkXMLBlacklist.append("globaldata");
+ m_checkXMLBlacklist.append("warnings");
+
m_checkXunitBlacklist = m_checkXMLBlacklist;
- m_checkXunitBlacklist.append("benchlibwalltime");
- m_checkXunitBlacklist.append("benchlibeventcounter");
- m_checkXunitBlacklist.append("benchlibcallgrind");
- m_checkXunitBlacklist.append("subtest");
- m_checkXunitBlacklist.append("globaldata");
- m_checkXunitBlacklist.append("warnings");
}
void tst_Selftests::checkXML() const