diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-19 16:02:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-22 14:09:49 +0000 |
| commit | b36c79f2a7a425c333372d1999eb6835ac1930ed (patch) | |
| tree | c57127a47c9f128bfff6e948fe90840904f71221 | |
| parent | 29d265fe383df52474448b887d9c96646d2f4743 (diff) | |
CMake: Disable test_QT_TESTCASE_BUILDDIR cmake build test
CMake 3.21.0 + Ninja now pass absolute source file paths to the
compiler which causes __FILE__ to be absolute and qFindTestData
to ignore any QT_TESTCASE_BUILDDIR value.
This causes the test to fail, because it won't find test data in the
custom specified location.
Disable the test for now.
Amends 70464b355ec1c7007e0b1291f733e2540ba1825f
Task-number: QTBUG-95268
Task-number: QTBUG-95018
Change-Id: If99035e897ac1d5f153d4e19c94e4355f88970af
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit d654ff4e9907d7fe2e67422cfa777aa8ea28302c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 8852c7e68b..eb23e66fe8 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -125,10 +125,14 @@ if (CMAKE_GENERATOR STREQUAL Ninja AND UNIX AND NOT WIN32) BINARY "tests/test_QFINDTESTDATA" SIMULATE_IN_SOURCE ) - _qt_internal_test_expect_pass(test_QT_TESTCASE_BUILDDIR - BINARY "test_qt_testcase_builddir" - SIMULATE_IN_SOURCE - ) + # TODO: Decide if there's a reason to keep this test. With CMake 3.21.0 which passes absolute + # source file paths to the compiler (instead of relative ones), specifying a custom + # QT_TESTCASE_BUILDDIR is a no-op, which fails the test's preconditions. + # See QTBUG-95268. + #_qt_internal_test_expect_pass(test_QT_TESTCASE_BUILDDIR + # BINARY "test_qt_testcase_builddir" + # SIMULATE_IN_SOURCE + #) endif() if (NOT NO_DBUS) |