summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/tst_selftests.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-09-21 10:38:09 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-21 03:59:17 +0200
commita097825b2135ebfde45a122ea9252954f4ddcd5f (patch)
tree5e0668050d3902164440dd6b48361943fc9f4ece /tests/auto/testlib/selftests/tst_selftests.cpp
parent1fcc6ba3d92e5b98eb60a1c90a9bd64e4c3ae3a8 (diff)
Don't run multiexec test with file logging
The multiexec test runs the same test object five times. If the -o option is given, the output file is overwritten by each run of the test object, meaning that tst_selftest only sees 1/5 of the test output in a file compared with what it sees on the console. This makes it impossible to use the expected output file to verify the test for both console and file output. This issue is noted in QTBUG-21561. Change-Id: I00031a2ea43a7ef78e8317473a089306ec062d8e Reviewed-on: http://codereview.qt-project.org/5270 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/testlib/selftests/tst_selftests.cpp')
-rw-r--r--tests/auto/testlib/selftests/tst_selftests.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index bd0594dbcf..5efaedbd86 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -270,12 +270,17 @@ void tst_Selftests::runSubTest_data()
arguments << "-eventcounter";
}
- // These tests don't work right with loggers other than plain text, usually because
- // they internally supply arguments to themselves.
+ // These tests don't work right unless logging plain text to
+ // standard output, either because they execute multiple test
+ // objects or because they internally supply arguments to
+ // themselves.
if (logger.name != "txt") {
if (subtest == "differentexec") {
continue;
}
+ if (subtest == "multiexec") {
+ continue;
+ }
if (subtest == "qexecstringlist") {
continue;
}