Merge remote-tracking branch 'origin/master' into api_changes

Change-Id: Ibcb1f7070f50968b77b66112750ce5c70fc0b6d0

1 files changed, 105 insertions, 0 deletions

diff --git a/tests/auto/testlib/selftests/expected_verbose2.txt b/tests/auto/testlib/selftests/expected_verbose2.txt
new file mode 100644
index 0000000000..9012a7c569
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_verbose2.txt
@@ -0,0 +1,105 @@
+********* Start testing of tst_Counting *********
+Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
+INFO   : tst_Counting::initTestCase() entering
+PASS   : tst_Counting::initTestCase()
+INFO   : tst_Counting::testPassPass() entering
+INFO   : tst_Counting::testPassPass(row 1) QVERIFY(true)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)]
+INFO   : tst_Counting::testPassPass(row 1) COMPARE()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)]
+PASS   : tst_Counting::testPassPass(row 1)
+INFO   : tst_Counting::testPassPass(row 2) QVERIFY(true)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)]
+INFO   : tst_Counting::testPassPass(row 2) COMPARE()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)]
+PASS   : tst_Counting::testPassPass(row 2)
+INFO   : tst_Counting::testPassSkip() entering
+INFO   : tst_Counting::testPassSkip(row 1) QVERIFY(true)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)]
+INFO   : tst_Counting::testPassSkip(row 1) COMPARE()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)]
+PASS   : tst_Counting::testPassSkip(row 1)
+SKIP   : tst_Counting::testPassSkip(row 2) Skipping
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)]
+INFO   : tst_Counting::testPassFail() entering
+INFO   : tst_Counting::testPassFail(row 1) QVERIFY(true)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)]
+INFO   : tst_Counting::testPassFail(row 1) COMPARE()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)]
+PASS   : tst_Counting::testPassFail(row 1)
+INFO   : tst_Counting::testPassFail(row 2) QVERIFY(false)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+FAIL!  : tst_Counting::testPassFail(row 2) 'false' returned FALSE. ()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+INFO   : tst_Counting::testSkipPass() entering
+SKIP   : tst_Counting::testSkipPass(row 1) Skipping
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)]
+INFO   : tst_Counting::testSkipPass(row 2) QVERIFY(true)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)]
+INFO   : tst_Counting::testSkipPass(row 2) COMPARE()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)]
+PASS   : tst_Counting::testSkipPass(row 2)
+INFO   : tst_Counting::testSkipSkip() entering
+SKIP   : tst_Counting::testSkipSkip(row 1) Skipping
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)]
+SKIP   : tst_Counting::testSkipSkip(row 2) Skipping
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)]
+INFO   : tst_Counting::testSkipFail() entering
+SKIP   : tst_Counting::testSkipFail(row 1) Skipping
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)]
+INFO   : tst_Counting::testSkipFail(row 2) QVERIFY(false)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+FAIL!  : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. ()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+INFO   : tst_Counting::testFailPass() entering
+INFO   : tst_Counting::testFailPass(row 1) QVERIFY(false)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+FAIL!  : tst_Counting::testFailPass(row 1) 'false' returned FALSE. ()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+INFO   : tst_Counting::testFailPass(row 2) QVERIFY(true)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(111)]
+INFO   : tst_Counting::testFailPass(row 2) COMPARE()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(112)]
+PASS   : tst_Counting::testFailPass(row 2)
+INFO   : tst_Counting::testFailSkip() entering
+INFO   : tst_Counting::testFailSkip(row 1) QVERIFY(false)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+FAIL!  : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. ()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+SKIP   : tst_Counting::testFailSkip(row 2) Skipping
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(118)]
+INFO   : tst_Counting::testFailFail() entering
+INFO   : tst_Counting::testFailFail(row 1) QVERIFY(false)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+FAIL!  : tst_Counting::testFailFail(row 1) 'false' returned FALSE. ()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+INFO   : tst_Counting::testFailFail(row 2) QVERIFY(false)
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+FAIL!  : tst_Counting::testFailFail(row 2) 'false' returned FALSE. ()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(115)]
+INFO   : tst_Counting::testFailInInit() entering
+PASS   : tst_Counting::testFailInInit(before)
+FAIL!  : tst_Counting::testFailInInit(fail) Fail in init()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(234)]
+PASS   : tst_Counting::testFailInInit(after)
+INFO   : tst_Counting::testFailInCleanup() entering
+PASS   : tst_Counting::testFailInCleanup(before)
+QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() 
+FAIL!  : tst_Counting::testFailInCleanup(fail) Fail in cleanup()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(242)]
+PASS   : tst_Counting::testFailInCleanup(after)
+INFO   : tst_Counting::testSkipInInit() entering
+PASS   : tst_Counting::testSkipInInit(before)
+SKIP   : tst_Counting::testSkipInInit(skip) Skip in init()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(236)]
+PASS   : tst_Counting::testSkipInInit(after)
+INFO   : tst_Counting::testSkipInCleanup() entering
+PASS   : tst_Counting::testSkipInCleanup(before)
+QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() 
+SKIP   : tst_Counting::testSkipInCleanup(skip) Skip in cleanup()
+   Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(244)]
+PASS   : tst_Counting::testSkipInCleanup(after)
+INFO   : tst_Counting::cleanupTestCase() entering
+PASS   : tst_Counting::cleanupTestCase()
+Totals: 16 passed, 8 failed, 8 skipped
+********* Finished testing of tst_Counting *********