883dfb3d15
Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commitc608ffc56a
) after the recent addition of the flowId attribute to the teamcity output (commit8f03656211
in 5.9). Change-Id: I3868166e5efc45538544fffd14d8aba438f9173c
13 lines
1.4 KiB
Plaintext
13 lines
1.4 KiB
Plaintext
##teamcity[testSuiteStarted name='tst_PairDiagnostics' flowId='tst_PairDiagnostics']
|
|
##teamcity[testStarted name='initTestCase()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testFinished name='initTestCase()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testStarted name='testQPair()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testFailed name='testQPair()' message='Failure! |[Loc: ../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(51)|]' details='Compared values are not the same|n Actual (pair1): "QPair(1,1)"|n Expected (pair2): "QPair(1,2)"' flowId='tst_PairDiagnostics']
|
|
##teamcity[testFinished name='testQPair()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testStarted name='testStdPair()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testFailed name='testStdPair()' message='Failure! |[Loc: ../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(58)|]' details='Compared values are not the same|n Actual (pair1): "std::pair(1,1)"|n Expected (pair2): "std::pair(1,2)"' flowId='tst_PairDiagnostics']
|
|
##teamcity[testFinished name='testStdPair()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testStarted name='cleanupTestCase()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testFinished name='cleanupTestCase()' flowId='tst_PairDiagnostics']
|
|
##teamcity[testSuiteFinished name='tst_PairDiagnostics' flowId='tst_PairDiagnostics']
|