diff options
Diffstat (limited to 'tests')
43 files changed, 315 insertions, 212 deletions
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml index cc83020650..ffa5481aa7 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml @@ -13,9 +13,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="skippingBenchmark"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> <Description><![CDATA[This is a skipping benchmark]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="failingBenchmark"> diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xml b/tests/auto/testlib/selftests/expected_benchlibcounting.xml index 7c8366ed8c..89d3c5eff6 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.xml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.xml @@ -15,9 +15,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="skippingBenchmark"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> <Description><![CDATA[This is a skipping benchmark]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="failingBenchmark"> diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv b/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv index bac416482e..caa54d0905 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.csv @@ -1 +1 @@ -"threeBillionTicks","","CPUTicks",3000071247,3000071247,1 +"threeBillionTicks","","CPUTicks",3000023453,3000023453,1 diff --git a/tests/auto/testlib/selftests/expected_blacklisted.lightxml b/tests/auto/testlib/selftests/expected_blacklisted.lightxml index 6d3931e47e..d9869a9571 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.lightxml +++ b/tests/auto/testlib/selftests/expected_blacklisted.lightxml @@ -15,9 +15,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This test should SKIP]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="fail"> @@ -37,9 +37,9 @@ <Incident type="bxfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This test should BXFAIL then SKIP]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This skip should be seen and counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailContinueFail"> @@ -61,9 +61,9 @@ <Incident type="bxpass" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. (This test should BXPASS then SKIP)]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This skip should be seen but not counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassContinueFail"> diff --git a/tests/auto/testlib/selftests/expected_blacklisted.teamcity b/tests/auto/testlib/selftests/expected_blacklisted.teamcity index 401b7153a3..a0f1833405 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.teamcity +++ b/tests/auto/testlib/selftests/expected_blacklisted.teamcity @@ -4,7 +4,9 @@ ##teamcity[testStarted name='pass()' flowId='tst_Blacklisted'] ##teamcity[testStdOut name='pass()' out='QDEBUG: This test should BPASS' flowId='tst_Blacklisted'] ##teamcity[testFinished name='pass()' flowId='tst_Blacklisted'] +##teamcity[testStarted name='skip()' flowId='tst_Blacklisted'] ##teamcity[testIgnored name='skip()' message='This test should SKIP |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' flowId='tst_Blacklisted'] +##teamcity[testFinished name='skip()' flowId='tst_Blacklisted'] ##teamcity[testStarted name='fail()' flowId='tst_Blacklisted'] ##teamcity[testFinished name='fail()' flowId='tst_Blacklisted'] ##teamcity[testStarted name='xfail()' flowId='tst_Blacklisted'] @@ -13,6 +15,7 @@ ##teamcity[testStarted name='xfailContinueSkip()' flowId='tst_Blacklisted'] ##teamcity[testFinished name='xfailContinueSkip()' flowId='tst_Blacklisted'] ##teamcity[testIgnored name='xfailContinueSkip()' message='This skip should be seen and counted |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' flowId='tst_Blacklisted'] +##teamcity[testFinished name='xfailContinueSkip()' flowId='tst_Blacklisted'] ##teamcity[testStarted name='xfailContinueFail()' flowId='tst_Blacklisted'] ##teamcity[testFinished name='xfailContinueFail()' flowId='tst_Blacklisted'] ##teamcity[testFinished name='xfailContinueFail()' flowId='tst_Blacklisted'] @@ -21,6 +24,7 @@ ##teamcity[testStarted name='xpassContinueSkip()' flowId='tst_Blacklisted'] ##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_Blacklisted'] ##teamcity[testIgnored name='xpassContinueSkip()' message='This skip should be seen but not counted |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' flowId='tst_Blacklisted'] +##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_Blacklisted'] ##teamcity[testStarted name='xpassContinueFail()' flowId='tst_Blacklisted'] ##teamcity[testFinished name='xpassContinueFail()' flowId='tst_Blacklisted'] ##teamcity[testFinished name='xpassContinueFail()' flowId='tst_Blacklisted'] diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xml b/tests/auto/testlib/selftests/expected_blacklisted.xml index 959a87de68..b57d589544 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.xml +++ b/tests/auto/testlib/selftests/expected_blacklisted.xml @@ -17,9 +17,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This test should SKIP]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="fail"> @@ -39,9 +39,9 @@ <Incident type="bxfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This test should BXFAIL then SKIP]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This skip should be seen and counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailContinueFail"> @@ -63,9 +63,9 @@ <Incident type="bxpass" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. (This test should BXPASS then SKIP)]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> <Description><![CDATA[This skip should be seen but not counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassContinueFail"> diff --git a/tests/auto/testlib/selftests/expected_counting.lightxml b/tests/auto/testlib/selftests/expected_counting.lightxml index 68730a3293..61d34927c8 100644 --- a/tests/auto/testlib/selftests/expected_counting.lightxml +++ b/tests/auto/testlib/selftests/expected_counting.lightxml @@ -20,10 +20,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> @@ -37,31 +37,31 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> @@ -83,10 +83,10 @@ <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> @@ -134,10 +134,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> @@ -151,10 +151,10 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> diff --git a/tests/auto/testlib/selftests/expected_counting.teamcity b/tests/auto/testlib/selftests/expected_counting.teamcity index 5ceaf155d8..b43ab3dc8b 100644 --- a/tests/auto/testlib/selftests/expected_counting.teamcity +++ b/tests/auto/testlib/selftests/expected_counting.teamcity @@ -7,18 +7,28 @@ ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 1)' 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: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] ##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] @@ -30,7 +40,9 @@ ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] ##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] @@ -54,14 +66,18 @@ ##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[testStarted name='testSkipInInit(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInInit(skip)' 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[testStarted name='testSkipInCleanup(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipInCleanup(skip)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInCleanup(skip)' 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'] diff --git a/tests/auto/testlib/selftests/expected_counting.xml b/tests/auto/testlib/selftests/expected_counting.xml index 841a49c30d..a9aa999b2e 100644 --- a/tests/auto/testlib/selftests/expected_counting.xml +++ b/tests/auto/testlib/selftests/expected_counting.xml @@ -22,10 +22,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> @@ -39,31 +39,31 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> @@ -85,10 +85,10 @@ <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> @@ -136,10 +136,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> @@ -153,10 +153,10 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> diff --git a/tests/auto/testlib/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml index 4c2beec6ca..db084a560d 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.lightxml +++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml @@ -34,9 +34,9 @@ <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail then skip]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This skip should be reported and counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAbortSkip"> @@ -82,14 +82,14 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQString"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Pass Abort]]></DataTag> <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Pass Continue]]></DataTag> <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description> -</Message> +</Incident> <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Fail Abort]]></DataTag> <Description><![CDATA[A string]]></Description> @@ -105,10 +105,10 @@ <DataTag><![CDATA[Fail Continue]]></DataTag> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Fail Continue]]></DataTag> <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQVerify"> @@ -241,9 +241,9 @@ <Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should be reached but not increment skip-count]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassContinueXfailAbort"> diff --git a/tests/auto/testlib/selftests/expected_expectfail.teamcity b/tests/auto/testlib/selftests/expected_expectfail.teamcity index 774318bdb6..ba0663f2d2 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.teamcity +++ b/tests/auto/testlib/selftests/expected_expectfail.teamcity @@ -9,8 +9,10 @@ ##teamcity[testFinished name='xfailAndAbort()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailContinueSkip()' flowId='tst_ExpectFail'] ##teamcity[testIgnored name='xfailContinueSkip()' message='This skip should be reported and counted |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailContinueSkip()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail then skip' flowId='tst_ExpectFail'] +##teamcity[testFinished name='xfailContinueSkip()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailAbortSkip()' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailAbortSkip()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail then skip|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailAbortSkip()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailAbortSkip()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailTwice()' flowId='tst_ExpectFail'] ##teamcity[testFailed name='xfailTwice()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='Already expecting a fail' flowId='tst_ExpectFail'] @@ -30,15 +32,20 @@ ##teamcity[testStarted name='xfailWithQString()' flowId='tst_ExpectFail'] ##teamcity[testStdOut name='xfailWithQString()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailWithQString()' flowId='tst_ExpectFail'] +##teamcity[testStarted name='xfailDataDrivenWithQString(Pass Abort)' flowId='tst_ExpectFail'] ##teamcity[testIgnored name='xfailDataDrivenWithQString(Pass Abort)' message='Each Continue or Pass reports this and increments skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail'] +##teamcity[testFinished name='xfailDataDrivenWithQString(Pass Abort)' flowId='tst_ExpectFail'] +##teamcity[testStarted name='xfailDataDrivenWithQString(Pass Continue)' flowId='tst_ExpectFail'] ##teamcity[testIgnored name='xfailDataDrivenWithQString(Pass Continue)' message='Each Continue or Pass reports this and increments skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail'] +##teamcity[testFinished name='xfailDataDrivenWithQString(Pass Continue)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQString(Fail Abort)' flowId='tst_ExpectFail'] ##teamcity[testStdOut name='xfailDataDrivenWithQString(Fail Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQString(Fail Abort)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQString(Fail Continue)' flowId='tst_ExpectFail'] ##teamcity[testIgnored name='xfailDataDrivenWithQString(Fail Continue)' message='Each Continue or Pass reports this and increments skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQString(Fail Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail'] +##teamcity[testFinished name='xfailDataDrivenWithQString(Fail Continue)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass Abort)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Pass Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass Abort)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass Continue)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass Continue)' flowId='tst_ExpectFail'] @@ -95,6 +102,7 @@ ##teamcity[testStdOut name='xpassContinueSkip()' out='QDEBUG: This should be reached' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_ExpectFail'] ##teamcity[testIgnored name='xpassContinueSkip()' message='This should be reached but not increment skip-count |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' flowId='tst_ExpectFail'] +##teamcity[testFinished name='xpassContinueSkip()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassContinueXfailAbort()' flowId='tst_ExpectFail'] ##teamcity[testFailed name='xpassContinueXfailAbort()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassContinueXfailAbort()' flowId='tst_ExpectFail'] diff --git a/tests/auto/testlib/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml index 9c25b28981..f7a2430973 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.xml +++ b/tests/auto/testlib/selftests/expected_expectfail.xml @@ -36,9 +36,9 @@ <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail then skip]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This skip should be reported and counted]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAbortSkip"> @@ -84,14 +84,14 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQString"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Pass Abort]]></DataTag> <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Pass Continue]]></DataTag> <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description> -</Message> +</Incident> <Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Fail Abort]]></DataTag> <Description><![CDATA[A string]]></Description> @@ -107,10 +107,10 @@ <DataTag><![CDATA[Fail Continue]]></DataTag> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Fail Continue]]></DataTag> <Description><![CDATA[Each Continue or Pass reports this and increments skip-count]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQVerify"> @@ -243,9 +243,9 @@ <Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should be reached but not increment skip-count]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassContinueXfailAbort"> diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml index 1212e4b364..0373b9ae7b 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.lightxml +++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml @@ -90,10 +90,10 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="skipLocal"> @@ -101,10 +101,10 @@ <DataTag><![CDATA[global=false:local=false]]></DataTag> <Description><![CDATA[init skipLocal local=false]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false:local=false]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=false:local=false]]></DataTag> <Description><![CDATA[cleanup skipLocal local=false]]></Description> @@ -113,10 +113,10 @@ <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[init skipLocal local=true]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[cleanup skipLocal local=true]]></Description> @@ -125,10 +125,10 @@ <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[init skipLocal local=false]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[cleanup skipLocal local=false]]></Description> @@ -137,10 +137,10 @@ <DataTag><![CDATA[global=true:local=true]]></DataTag> <Description><![CDATA[init skipLocal local=true]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=true:local=true]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=true:local=true]]></DataTag> <Description><![CDATA[cleanup skipLocal local=true]]></Description> @@ -167,10 +167,10 @@ <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[init skipSingle local=true]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[cleanup skipSingle local=true]]></Description> @@ -179,10 +179,10 @@ <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[init skipSingle local=false]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[cleanup skipSingle local=false]]></Description> diff --git a/tests/auto/testlib/selftests/expected_globaldata.teamcity b/tests/auto/testlib/selftests/expected_globaldata.teamcity index f76f6090ba..7c1c33e1de 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.teamcity +++ b/tests/auto/testlib/selftests/expected_globaldata.teamcity @@ -14,18 +14,38 @@ ##teamcity[testStarted name='testGlobal(local=true)' flowId='tst_globaldata'] ##teamcity[testStdOut name='testGlobal(local=true)' out='QDEBUG: init testGlobal local=true|nQDEBUG: global: true|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local=true' flowId='tst_globaldata'] ##teamcity[testFinished name='testGlobal(local=true)' flowId='tst_globaldata'] +##teamcity[testStarted name='skip()' flowId='tst_globaldata'] ##teamcity[testIgnored name='skip()' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testFinished name='skip()' flowId='tst_globaldata'] +##teamcity[testStarted name='skipLocal(local=false)' flowId='tst_globaldata'] ##teamcity[testIgnored name='skipLocal(local=false)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipLocal(local=false)' out='QDEBUG: init skipLocal local=false' flowId='tst_globaldata'] +##teamcity[testFinished name='skipLocal(local=false)' flowId='tst_globaldata'] +##teamcity[testStarted name='skipLocal(local=true)' flowId='tst_globaldata'] ##teamcity[testIgnored name='skipLocal(local=true)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipLocal(local=true)' out='QDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true' flowId='tst_globaldata'] +##teamcity[testFinished name='skipLocal(local=true)' flowId='tst_globaldata'] +##teamcity[testStarted name='skipLocal(local=false)' flowId='tst_globaldata'] ##teamcity[testIgnored name='skipLocal(local=false)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipLocal(local=false)' out='QDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipLocal local=false' flowId='tst_globaldata'] +##teamcity[testFinished name='skipLocal(local=false)' flowId='tst_globaldata'] +##teamcity[testStarted name='skipLocal(local=true)' flowId='tst_globaldata'] ##teamcity[testIgnored name='skipLocal(local=true)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipLocal(local=true)' out='QDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true' flowId='tst_globaldata'] +##teamcity[testFinished name='skipLocal(local=true)' flowId='tst_globaldata'] ##teamcity[testStarted name='skipSingle(local=false)' flowId='tst_globaldata'] -##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: init skipLocal local=false|nQDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true|nQDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipLocal local=false|nQDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true|nQDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local=false' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local=false' flowId='tst_globaldata'] ##teamcity[testFinished name='skipSingle(local=false)' flowId='tst_globaldata'] +##teamcity[testStarted name='skipSingle(local=true)' flowId='tst_globaldata'] ##teamcity[testIgnored name='skipSingle(local=true)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: init skipSingle local=true' flowId='tst_globaldata'] +##teamcity[testFinished name='skipSingle(local=true)' flowId='tst_globaldata'] +##teamcity[testStarted name='skipSingle(local=false)' flowId='tst_globaldata'] ##teamcity[testIgnored name='skipSingle(local=false)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: cleanup skipSingle local=true|nQDEBUG: init skipSingle local=false' flowId='tst_globaldata'] +##teamcity[testFinished name='skipSingle(local=false)' flowId='tst_globaldata'] ##teamcity[testStarted name='skipSingle(local=true)' flowId='tst_globaldata'] -##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: init skipSingle local=true|nQDEBUG: cleanup skipSingle local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: cleanup skipSingle local=false|nQDEBUG: init skipSingle local=true|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local=true' flowId='tst_globaldata'] +##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: cleanup skipSingle local=false|nQDEBUG: init skipSingle local=true|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local=true' flowId='tst_globaldata'] ##teamcity[testFinished name='skipSingle(local=true)' flowId='tst_globaldata'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_globaldata'] ##teamcity[testStdOut name='cleanupTestCase()' out='QDEBUG: cleanupTestCase cleanupTestCase (null)' flowId='tst_globaldata'] diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml index 9aa48c8f16..b9a666bd0c 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.xml +++ b/tests/auto/testlib/selftests/expected_globaldata.xml @@ -92,10 +92,10 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="skipLocal"> @@ -103,10 +103,10 @@ <DataTag><![CDATA[global=false:local=false]]></DataTag> <Description><![CDATA[init skipLocal local=false]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false:local=false]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=false:local=false]]></DataTag> <Description><![CDATA[cleanup skipLocal local=false]]></Description> @@ -115,10 +115,10 @@ <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[init skipLocal local=true]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[cleanup skipLocal local=true]]></Description> @@ -127,10 +127,10 @@ <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[init skipLocal local=false]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[cleanup skipLocal local=false]]></Description> @@ -139,10 +139,10 @@ <DataTag><![CDATA[global=true:local=true]]></DataTag> <Description><![CDATA[init skipLocal local=true]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=true:local=true]]></DataTag> <Description><![CDATA[skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=true:local=true]]></DataTag> <Description><![CDATA[cleanup skipLocal local=true]]></Description> @@ -169,10 +169,10 @@ <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[init skipSingle local=true]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=false:local=true]]></DataTag> <Description><![CDATA[cleanup skipSingle local=true]]></Description> @@ -181,10 +181,10 @@ <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[init skipSingle local=false]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[global=true:local=false]]></DataTag> <Description><![CDATA[cleanup skipSingle local=false]]></Description> diff --git a/tests/auto/testlib/selftests/expected_mouse.lightxml b/tests/auto/testlib/selftests/expected_mouse.lightxml index a691dbd931..4938ef1a82 100644 --- a/tests/auto/testlib/selftests/expected_mouse.lightxml +++ b/tests/auto/testlib/selftests/expected_mouse.lightxml @@ -38,20 +38,20 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="stateHandlingPart2"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> <Description><![CDATA[Not implemented beyond this point!]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="deterministicEvents"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> <DataTag><![CDATA[first-run-true]]></DataTag> <Description><![CDATA[Not implemented!]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> <DataTag><![CDATA[first-run-false]]></DataTag> <Description><![CDATA[Not implemented!]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/testlib/selftests/expected_mouse.teamcity b/tests/auto/testlib/selftests/expected_mouse.teamcity index 00004611b3..371bd49626 100644 --- a/tests/auto/testlib/selftests/expected_mouse.teamcity +++ b/tests/auto/testlib/selftests/expected_mouse.teamcity @@ -17,9 +17,15 @@ ##teamcity[testFinished name='stateHandlingPart1(dummy-1)' flowId='tst_Mouse'] ##teamcity[testStarted name='stateHandlingPart1(dummy-2)' flowId='tst_Mouse'] ##teamcity[testFinished name='stateHandlingPart1(dummy-2)' flowId='tst_Mouse'] +##teamcity[testStarted name='stateHandlingPart2()' flowId='tst_Mouse'] ##teamcity[testIgnored name='stateHandlingPart2()' message='Not implemented beyond this point! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse'] +##teamcity[testFinished name='stateHandlingPart2()' flowId='tst_Mouse'] +##teamcity[testStarted name='deterministicEvents(first-run-true)' flowId='tst_Mouse'] ##teamcity[testIgnored name='deterministicEvents(first-run-true)' message='Not implemented! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse'] +##teamcity[testFinished name='deterministicEvents(first-run-true)' flowId='tst_Mouse'] +##teamcity[testStarted name='deterministicEvents(first-run-false)' flowId='tst_Mouse'] ##teamcity[testIgnored name='deterministicEvents(first-run-false)' message='Not implemented! |[Loc: qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp(0)|]' flowId='tst_Mouse'] +##teamcity[testFinished name='deterministicEvents(first-run-false)' flowId='tst_Mouse'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Mouse'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Mouse'] ##teamcity[testSuiteFinished name='tst_Mouse' flowId='tst_Mouse'] diff --git a/tests/auto/testlib/selftests/expected_mouse.xml b/tests/auto/testlib/selftests/expected_mouse.xml index 3fb68a72ed..e3858b4a82 100644 --- a/tests/auto/testlib/selftests/expected_mouse.xml +++ b/tests/auto/testlib/selftests/expected_mouse.xml @@ -40,20 +40,20 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="stateHandlingPart2"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> <Description><![CDATA[Not implemented beyond this point!]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="deterministicEvents"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> <DataTag><![CDATA[first-run-true]]></DataTag> <Description><![CDATA[Not implemented!]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/mouse/tst_mouse.cpp" line="0"> <DataTag><![CDATA[first-run-false]]></DataTag> <Description><![CDATA[Not implemented!]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/testlib/selftests/expected_silent.txt b/tests/auto/testlib/selftests/expected_silent.txt index efa1c985dc..127e39a6c1 100644 --- a/tests/auto/testlib/selftests/expected_silent.txt +++ b/tests/auto/testlib/selftests/expected_silent.txt @@ -1,4 +1,6 @@ Testing tst_Silent +SKIP : tst_Silent::skip() This test should skip + Loc: [qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)] FAIL! : tst_Silent::fail() 'false' returned FALSE. (This test should fail) Loc: [qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)] XPASS : tst_Silent::xpass() 'true' returned TRUE unexpectedly. (This test should XPASS) diff --git a/tests/auto/testlib/selftests/expected_singleskip.lightxml b/tests/auto/testlib/selftests/expected_singleskip.lightxml index 10e35ae27b..123a925769 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.lightxml +++ b/tests/auto/testlib/selftests/expected_singleskip.lightxml @@ -8,9 +8,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="myTest"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0"> <Description><![CDATA[skipping test]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/testlib/selftests/expected_singleskip.teamcity b/tests/auto/testlib/selftests/expected_singleskip.teamcity index 461538cead..c192c1177a 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.teamcity +++ b/tests/auto/testlib/selftests/expected_singleskip.teamcity @@ -1,7 +1,9 @@ ##teamcity[testSuiteStarted name='tst_SingleSkip' flowId='tst_SingleSkip'] ##teamcity[testStarted name='initTestCase()' flowId='tst_SingleSkip'] ##teamcity[testFinished name='initTestCase()' flowId='tst_SingleSkip'] +##teamcity[testStarted name='myTest()' flowId='tst_SingleSkip'] ##teamcity[testIgnored name='myTest()' message='skipping test |[Loc: qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp(0)|]' flowId='tst_SingleSkip'] +##teamcity[testFinished name='myTest()' flowId='tst_SingleSkip'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SingleSkip'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SingleSkip'] ##teamcity[testSuiteFinished name='tst_SingleSkip' flowId='tst_SingleSkip'] diff --git a/tests/auto/testlib/selftests/expected_singleskip.xml b/tests/auto/testlib/selftests/expected_singleskip.xml index a36e74a236..9e55ba731c 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.xml +++ b/tests/auto/testlib/selftests/expected_singleskip.xml @@ -10,9 +10,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="myTest"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0"> <Description><![CDATA[skipping test]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/testlib/selftests/expected_skip.lightxml b/tests/auto/testlib/selftests/expected_skip.lightxml index d44cfe317d..5293102f25 100644 --- a/tests/auto/testlib/selftests/expected_skip.lightxml +++ b/tests/auto/testlib/selftests/expected_skip.lightxml @@ -8,22 +8,22 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="test"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="emptytest"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="singleSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <DataTag><![CDATA[local 1]]></DataTag> <Description><![CDATA[skipping one]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[local 2]]></DataTag> <Description><![CDATA[this line should only be reached once (true)]]></Description> diff --git a/tests/auto/testlib/selftests/expected_skip.teamcity b/tests/auto/testlib/selftests/expected_skip.teamcity index 472690195f..043d65fd7f 100644 --- a/tests/auto/testlib/selftests/expected_skip.teamcity +++ b/tests/auto/testlib/selftests/expected_skip.teamcity @@ -1,9 +1,15 @@ ##teamcity[testSuiteStarted name='tst_Skip' flowId='tst_Skip'] ##teamcity[testStarted name='initTestCase()' flowId='tst_Skip'] ##teamcity[testFinished name='initTestCase()' flowId='tst_Skip'] +##teamcity[testStarted name='test()' flowId='tst_Skip'] ##teamcity[testIgnored name='test()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip'] +##teamcity[testFinished name='test()' flowId='tst_Skip'] +##teamcity[testStarted name='emptytest()' flowId='tst_Skip'] ##teamcity[testIgnored name='emptytest()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip'] +##teamcity[testFinished name='emptytest()' flowId='tst_Skip'] +##teamcity[testStarted name='singleSkip(local 1)' flowId='tst_Skip'] ##teamcity[testIgnored name='singleSkip(local 1)' message='skipping one |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip'] +##teamcity[testFinished name='singleSkip(local 1)' flowId='tst_Skip'] ##teamcity[testStarted name='singleSkip(local 2)' flowId='tst_Skip'] ##teamcity[testStdOut name='singleSkip(local 2)' out='QDEBUG: this line should only be reached once (true)' flowId='tst_Skip'] ##teamcity[testFinished name='singleSkip(local 2)' flowId='tst_Skip'] diff --git a/tests/auto/testlib/selftests/expected_skip.xml b/tests/auto/testlib/selftests/expected_skip.xml index 70d3d12cf5..455215436d 100644 --- a/tests/auto/testlib/selftests/expected_skip.xml +++ b/tests/auto/testlib/selftests/expected_skip.xml @@ -10,22 +10,22 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="test"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="emptytest"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="singleSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <DataTag><![CDATA[local 1]]></DataTag> <Description><![CDATA[skipping one]]></Description> -</Message> +</Incident> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[local 2]]></DataTag> <Description><![CDATA[this line should only be reached once (true)]]></Description> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml index ac310226e8..9a5be4a5f8 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml @@ -12,9 +12,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> <Description><![CDATA[Skip inside cleanupTestCase.]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.teamcity b/tests/auto/testlib/selftests/expected_skipcleanup.teamcity index 12b0d0e0d2..bdc3c0f70a 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.teamcity +++ b/tests/auto/testlib/selftests/expected_skipcleanup.teamcity @@ -3,5 +3,7 @@ ##teamcity[testFinished name='initTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testStarted name='aTestFunction()' flowId='tst_SkipCleanup'] ##teamcity[testFinished name='aTestFunction()' flowId='tst_SkipCleanup'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testIgnored name='cleanupTestCase()' message='Skip inside cleanupTestCase. |[Loc: qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)|]' flowId='tst_SkipCleanup'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testSuiteFinished name='tst_SkipCleanup' flowId='tst_SkipCleanup'] diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xml b/tests/auto/testlib/selftests/expected_skipcleanup.xml index 14207b2196..b2af22c42c 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.xml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.xml @@ -14,9 +14,9 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> <Description><![CDATA[Skip inside cleanupTestCase.]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipinit.lightxml b/tests/auto/testlib/selftests/expected_skipinit.lightxml index 76f4365cae..762fc212a3 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.lightxml +++ b/tests/auto/testlib/selftests/expected_skipinit.lightxml @@ -4,9 +4,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/testlib/selftests/expected_skipinit.teamcity b/tests/auto/testlib/selftests/expected_skipinit.teamcity index 07a30c743d..189953f532 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.teamcity +++ b/tests/auto/testlib/selftests/expected_skipinit.teamcity @@ -1,5 +1,7 @@ ##teamcity[testSuiteStarted name='tst_SkipInit' flowId='tst_SkipInit'] +##teamcity[testStarted name='initTestCase()' flowId='tst_SkipInit'] ##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase. This should skip all tests in the class. |[Loc: qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp(0)|]' flowId='tst_SkipInit'] +##teamcity[testFinished name='initTestCase()' flowId='tst_SkipInit'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipInit'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipInit'] ##teamcity[testSuiteFinished name='tst_SkipInit' flowId='tst_SkipInit'] diff --git a/tests/auto/testlib/selftests/expected_skipinit.xml b/tests/auto/testlib/selftests/expected_skipinit.xml index 7e0c1564b6..4ddf399475 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.xml +++ b/tests/auto/testlib/selftests/expected_skipinit.xml @@ -6,9 +6,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml index 27a207a4a2..00d0007716 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml @@ -4,9 +4,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.teamcity b/tests/auto/testlib/selftests/expected_skipinitdata.teamcity index 8ae11fc7ff..61430deab0 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.teamcity +++ b/tests/auto/testlib/selftests/expected_skipinitdata.teamcity @@ -1,3 +1,5 @@ ##teamcity[testSuiteStarted name='tst_SkipInitData' flowId='tst_SkipInitData'] +##teamcity[testStarted name='initTestCase()' flowId='tst_SkipInitData'] ##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase_data. This should skip all tests in the class. |[Loc: qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp(0)|]' flowId='tst_SkipInitData'] +##teamcity[testFinished name='initTestCase()' flowId='tst_SkipInitData'] ##teamcity[testSuiteFinished name='tst_SkipInitData' flowId='tst_SkipInitData'] diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml index cf0189e6be..c70966a469 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.xml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml @@ -6,9 +6,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_verbose1.lightxml b/tests/auto/testlib/selftests/expected_verbose1.lightxml index 68730a3293..61d34927c8 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.lightxml +++ b/tests/auto/testlib/selftests/expected_verbose1.lightxml @@ -20,10 +20,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> @@ -37,31 +37,31 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> @@ -83,10 +83,10 @@ <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> @@ -134,10 +134,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> @@ -151,10 +151,10 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> diff --git a/tests/auto/testlib/selftests/expected_verbose1.teamcity b/tests/auto/testlib/selftests/expected_verbose1.teamcity index 5ceaf155d8..b43ab3dc8b 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.teamcity +++ b/tests/auto/testlib/selftests/expected_verbose1.teamcity @@ -7,18 +7,28 @@ ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 1)' 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: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] ##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] @@ -30,7 +40,9 @@ ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] ##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] @@ -54,14 +66,18 @@ ##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[testStarted name='testSkipInInit(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInInit(skip)' 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[testStarted name='testSkipInCleanup(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipInCleanup(skip)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInCleanup(skip)' 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'] diff --git a/tests/auto/testlib/selftests/expected_verbose1.xml b/tests/auto/testlib/selftests/expected_verbose1.xml index 841a49c30d..a9aa999b2e 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.xml +++ b/tests/auto/testlib/selftests/expected_verbose1.xml @@ -22,10 +22,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> @@ -39,31 +39,31 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> @@ -85,10 +85,10 @@ <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> @@ -136,10 +136,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> @@ -153,10 +153,10 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> diff --git a/tests/auto/testlib/selftests/expected_verbose2.lightxml b/tests/auto/testlib/selftests/expected_verbose2.lightxml index cad736a7e6..8659a2fd8f 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.lightxml +++ b/tests/auto/testlib/selftests/expected_verbose2.lightxml @@ -44,10 +44,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> @@ -73,10 +73,10 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> @@ -91,21 +91,21 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> @@ -147,10 +147,10 @@ <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> @@ -206,10 +206,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> @@ -223,10 +223,10 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> diff --git a/tests/auto/testlib/selftests/expected_verbose2.teamcity b/tests/auto/testlib/selftests/expected_verbose2.teamcity index 2aebb94938..e62c734e40 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.teamcity +++ b/tests/auto/testlib/selftests/expected_verbose2.teamcity @@ -10,7 +10,9 @@ ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] ##teamcity[testStdOut name='testPassSkip(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testPassSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testStdOut name='testPassFail(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting'] @@ -18,13 +20,21 @@ ##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testStdOut name='testPassFail(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] ##teamcity[testStdOut name='testSkipPass(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipSkip(row 2)' flowId='tst_Counting'] +##teamcity[testStarted name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] ##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testStdOut name='testSkipFail(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] @@ -40,7 +50,9 @@ ##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testStdOut name='testFailSkip(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] +##teamcity[testStarted name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testFailSkip(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] ##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testStdOut name='testFailFail(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] @@ -66,14 +78,18 @@ ##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[testStarted name='testSkipInInit(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInInit(skip)' 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[testStarted name='testSkipInCleanup(skip)' flowId='tst_Counting'] ##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipInCleanup(skip)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] +##teamcity[testFinished name='testSkipInCleanup(skip)' 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'] diff --git a/tests/auto/testlib/selftests/expected_verbose2.xml b/tests/auto/testlib/selftests/expected_verbose2.xml index b7226db3bf..91d423a988 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.xml +++ b/tests/auto/testlib/selftests/expected_verbose2.xml @@ -46,10 +46,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> @@ -75,10 +75,10 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> @@ -93,21 +93,21 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +</Incident> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> @@ -149,10 +149,10 @@ <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> @@ -208,10 +208,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> @@ -225,10 +225,10 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> -</Message> +</Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> diff --git a/tests/auto/testlib/selftests/expected_warnings.lightxml b/tests/auto/testlib/selftests/expected_warnings.lightxml index 9a76de420a..c3df471f7f 100644 --- a/tests/auto/testlib/selftests/expected_warnings.lightxml +++ b/tests/auto/testlib/selftests/expected_warnings.lightxml @@ -192,9 +192,9 @@ Ran out of cabbage!]]></Description> <Description><![CDATA[Received a warning that resulted in a failure: Ran out of cabbage!]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0"> <Description><![CDATA[My cabbage! :(]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailOnWarningsAndIgnoreWarnings"> diff --git a/tests/auto/testlib/selftests/expected_warnings.teamcity b/tests/auto/testlib/selftests/expected_warnings.teamcity index e488ce7b30..67dd039ebf 100644 --- a/tests/auto/testlib/selftests/expected_warnings.teamcity +++ b/tests/auto/testlib/selftests/expected_warnings.teamcity @@ -54,6 +54,7 @@ ##teamcity[testFailed name='testFailOnWarningsThenSkip()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp(0)|]' details='Received a warning that resulted in a failure:|nRan out of cabbage!' flowId='tst_Warnings'] ##teamcity[testFinished name='testFailOnWarningsThenSkip()' flowId='tst_Warnings'] ##teamcity[testIgnored name='testFailOnWarningsThenSkip()' message='My cabbage! :( |[Loc: qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp(0)|]' flowId='tst_Warnings'] +##teamcity[testFinished name='testFailOnWarningsThenSkip()' flowId='tst_Warnings'] ##teamcity[testStarted name='testFailOnWarningsAndIgnoreWarnings()' flowId='tst_Warnings'] ##teamcity[testFinished name='testFailOnWarningsAndIgnoreWarnings()' flowId='tst_Warnings'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Warnings'] diff --git a/tests/auto/testlib/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml index aab6a99f74..de2b33bfd7 100644 --- a/tests/auto/testlib/selftests/expected_warnings.xml +++ b/tests/auto/testlib/selftests/expected_warnings.xml @@ -194,9 +194,9 @@ Ran out of cabbage!]]></Description> <Description><![CDATA[Received a warning that resulted in a failure: Ran out of cabbage!]]></Description> </Incident> -<Message type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0"> +<Incident type="skip" file="qtbase/tests/auto/testlib/selftests/warnings/tst_warnings.cpp" line="0"> <Description><![CDATA[My cabbage! :(]]></Description> -</Message> +</Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailOnWarningsAndIgnoreWarnings"> |