diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-08-24 07:49:16 +0000 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-11-10 10:50:20 +0200 |
| commit | f77498d211074c9d1fff744b77a917b4c0dfdc77 (patch) | |
| tree | 8ec2f04f9c2c76f4581a59a6dfd3e1171273269c /recipes-qt | |
| parent | 8468dd9b99f4de5cb13732ec9c28cfd292c44e36 (diff) | |
ptest: remove build paths from tests
Testlib adds references to the build and source directories to tests,
which causes warnings on buildpaths QA test. Remove those references.
Task-number: QTBUG-105913
Change-Id: Ic63e72a0b11bef55876ef5ca40d0c1d753243004
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 3102804b6504c98064101fac9a357fcbb1237fcd)
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch | 28 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch b/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch new file mode 100644 index 0000000..ec8bd4a --- /dev/null +++ b/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch @@ -0,0 +1,28 @@ +From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Mon, 22 Aug 2022 15:01:28 +0300 +Subject: [PATCH] testlib: don't track the build or source directories + +Build tests without location of the build and sources directories. + +Upstream-Status: Inappropriate [embedded specific] +Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2 +--- + src/testlib/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt +index 03deb2edc9..972b366532 100644 +--- a/src/testlib/CMakeLists.txt ++++ b/src/testlib/CMakeLists.txt +@@ -125,8 +125,8 @@ set(qt_tc_build_dir_def + "$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>" + ) + set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS +- QT_TESTCASE_BUILDDIR="${qt_tc_build_dir_def}" +- QT_TESTCASE_SOURCEDIR="$<TARGET_PROPERTY:SOURCE_DIR>" ++ QT_TESTCASE_BUILDDIR="" ++ QT_TESTCASE_SOURCEDIR="" + ) + + # special case begin diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 47e1f07..4aec73e 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -20,6 +20,7 @@ SRC_URI += "\ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-tests-disable-failing-tests.patch \ file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \ + file://0005-testlib-don-t-track-the-build-or-source-directories.patch \ " DEPENDS += "\ |