diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-07 13:53:05 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-08 11:48:10 +0200 |
| commit | 883dfb3d156431eeb3ffc8f02a09c89bb7fa7d46 (patch) | |
| tree | d4c2b3d096e1d5c64be698b5d0cd8c8bae35b2b4 /tests/auto/testlib/selftests/expected_verbose2.teamcity | |
| parent | 5a9b1425e187bc77122354cf7446bcf6bb322ff4 (diff) | |
| parent | b75bc0f75c09b192dba68449b009cdf175519dbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/kernel/qwidget.cpp
This merge also extends the expected output of the pairdiagnostics
teamcity output (added in dev in commit
c608ffc56ab37f9a9d5b9c34543126adb89e2b08) after the recent addition of
the flowId attribute to the teamcity output (commit
8f036562119dd35ce51dc9230304d893b906bd37 in 5.9).
Change-Id: I3868166e5efc45538544fffd14d8aba438f9173c
Diffstat (limited to 'tests/auto/testlib/selftests/expected_verbose2.teamcity')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_verbose2.teamcity | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/tests/auto/testlib/selftests/expected_verbose2.teamcity b/tests/auto/testlib/selftests/expected_verbose2.teamcity index 749cf384a4..138e223fa5 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.teamcity +++ b/tests/auto/testlib/selftests/expected_verbose2.teamcity @@ -1,80 +1,80 @@ -##teamcity[testSuiteStarted name='tst_Counting'] -##teamcity[testStarted name='initTestCase()'] -##teamcity[testFinished name='initTestCase()'] -##teamcity[testStarted name='testPassPass(row 1)'] -##teamcity[testStdOut name='testPassPass(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)'] -##teamcity[testFinished name='testPassPass(row 1)'] -##teamcity[testStarted name='testPassPass(row 2)'] -##teamcity[testStdOut name='testPassPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)'] -##teamcity[testFinished name='testPassPass(row 2)'] -##teamcity[testStarted name='testPassSkip(row 1)'] -##teamcity[testStdOut name='testPassSkip(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)'] -##teamcity[testFinished name='testPassSkip(row 1)'] -##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testPassFail(row 1)'] -##teamcity[testStdOut name='testPassFail(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)'] -##teamcity[testFinished name='testPassFail(row 1)'] -##teamcity[testStarted name='testPassFail(row 2)'] -##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testStdOut name='testPassFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)'] -##teamcity[testFinished name='testPassFail(row 2)'] -##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testSkipPass(row 2)'] -##teamcity[testStdOut name='testSkipPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)'] -##teamcity[testFinished name='testSkipPass(row 2)'] -##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testSkipFail(row 2)'] -##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testStdOut name='testSkipFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)'] -##teamcity[testFinished name='testSkipFail(row 2)'] -##teamcity[testStarted name='testFailPass(row 1)'] -##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testStdOut name='testFailPass(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)'] -##teamcity[testFinished name='testFailPass(row 1)'] -##teamcity[testStarted name='testFailPass(row 2)'] -##teamcity[testStdOut name='testFailPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)'] -##teamcity[testFinished name='testFailPass(row 2)'] -##teamcity[testStarted name='testFailSkip(row 1)'] -##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testStdOut name='testFailSkip(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)'] -##teamcity[testFinished name='testFailSkip(row 1)'] -##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]'] -##teamcity[testStarted name='testFailFail(row 1)'] -##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testStdOut name='testFailFail(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)'] -##teamcity[testFinished name='testFailFail(row 1)'] -##teamcity[testStarted name='testFailFail(row 2)'] -##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()'] -##teamcity[testStdOut name='testFailFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)'] -##teamcity[testFinished name='testFailFail(row 2)'] -##teamcity[testStarted name='testFailInInit(before)'] -##teamcity[testFinished name='testFailInInit(before)'] -##teamcity[testStarted name='testFailInInit(fail)'] -##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(226)|]' details='Fail in init()'] -##teamcity[testFinished name='testFailInInit(fail)'] -##teamcity[testStarted name='testFailInInit(after)'] -##teamcity[testFinished name='testFailInInit(after)'] -##teamcity[testStarted name='testFailInCleanup(before)'] -##teamcity[testFinished name='testFailInCleanup(before)'] -##teamcity[testStarted name='testFailInCleanup(fail)'] -##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(234)|]' details='Fail in cleanup()'] -##teamcity[testStdOut name='testFailInCleanup(fail)' out='QDEBUG: This test function should execute and then QFAIL in cleanup()'] -##teamcity[testFinished name='testFailInCleanup(fail)'] -##teamcity[testStarted name='testFailInCleanup(after)'] -##teamcity[testFinished name='testFailInCleanup(after)'] -##teamcity[testStarted name='testSkipInInit(before)'] -##teamcity[testFinished name='testSkipInInit(before)'] -##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: ../counting/tst_counting.cpp(228)|]'] -##teamcity[testStarted name='testSkipInInit(after)'] -##teamcity[testFinished name='testSkipInInit(after)'] -##teamcity[testStarted name='testSkipInCleanup(before)'] -##teamcity[testFinished name='testSkipInCleanup(before)'] -##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: ../counting/tst_counting.cpp(236)|]'] -##teamcity[testStarted name='testSkipInCleanup(after)'] -##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()'] -##teamcity[testFinished name='testSkipInCleanup(after)'] -##teamcity[testStarted name='cleanupTestCase()'] -##teamcity[testFinished name='cleanupTestCase()'] -##teamcity[testSuiteFinished name='tst_Counting'] +##teamcity[testSuiteStarted name='tst_Counting' flowId='tst_Counting'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Counting'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Counting'] +##teamcity[testStarted name='testPassPass(row 1)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassPass(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testFinished name='testPassPass(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassPass(row 2)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassSkip(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] +##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassFail(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassFail(row 2)' flowId='tst_Counting'] +##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] +##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailPass(row 1)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailPass(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailPass(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailPass(row 2)' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailPass(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailSkip(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailFail(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailFail(row 2)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInInit(before)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInInit(before)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInInit(fail)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(226)|]' details='Fail in init()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInInit(fail)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInInit(after)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInInit(after)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInCleanup(before)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInCleanup(before)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInCleanup(fail)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(234)|]' details='Fail in cleanup()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailInCleanup(fail)' out='QDEBUG: This test function should execute and then QFAIL in cleanup()' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInCleanup(fail)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailInCleanup(after)' flowId='tst_Counting'] +##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: ../counting/tst_counting.cpp(228)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: ../counting/tst_counting.cpp(236)|]' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Counting'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Counting'] +##teamcity[testSuiteFinished name='tst_Counting' flowId='tst_Counting'] |