diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
| commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
| tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml | |
| parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
| parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
Diffstat (limited to 'tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml new file mode 100644 index 0000000000..0a276a17f5 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="2" tests="5" name="tst_TupleDiagnostics"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="testEmptyTuple"/> + <testcase result="fail" name="testSimpleTuple"> + <failure message="Compared values are not the same + Actual (std::tuple<int>{1}): std::tuple(1) + Expected (std::tuple<int>{2}): std::tuple(2)" result="fail"/> + </testcase> + <testcase result="fail" name="testTuple"> + <failure message="Compared values are not the same + Actual (tuple1): std::tuple(42, 'Y', "tuple1") + Expected (tuple2): std::tuple(42, 'Y', "tuple2")" result="fail"/> + </testcase> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> |