summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/tst_selftests.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-03-05 10:44:04 +0100
committerLars Knoll <lars.knoll@nokia.com>2012-03-05 10:44:48 +0100
commitd51abed57a8f677a0d4eac57fd3f16bd4662190a (patch)
treeb3e173db4b72edbff6cb8dcc203c3d4526a1b51b /tests/auto/testlib/selftests/tst_selftests.cpp
parent07ae18f96e87a2db40ae014f28893f1080efa7ae (diff)
parent0862d7f78af978cf513097b3bdc33cd8096dee75 (diff)
Merge remote-tracking branch 'origin/master' into api_changes
Diffstat (limited to 'tests/auto/testlib/selftests/tst_selftests.cpp')
-rw-r--r--tests/auto/testlib/selftests/tst_selftests.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 2b90bdb389..5d216992d7 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -346,6 +346,7 @@ void tst_Selftests::runSubTest_data()
// Disable this test on Windows, as the run-time will popup dialogs with warnings
<< "fetchbogus"
#endif
+ << "findtestdata"
<< "float"
<< "globaldata"
<< "longstring"
@@ -363,7 +364,8 @@ void tst_Selftests::runSubTest_data()
<< "sleep"
<< "strcmp"
<< "subtest"
- << "findtestdata"
+ << "verbose1"
+ << "verbose2"
<< "warnings"
<< "xunit"
;
@@ -413,6 +415,12 @@ void tst_Selftests::runSubTest_data()
else if (subtest == "silent") {
arguments << "-silent";
}
+ else if (subtest == "verbose1") {
+ arguments << "-v1";
+ }
+ else if (subtest == "verbose2") {
+ arguments << "-v2";
+ }
// These tests don't work right unless logging plain text to