diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-08-24 07:49:16 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2022-09-19 14:58:53 +0200 |
| commit | e7cbd04f349b28e49b9b4e040f707ad308a62a3e (patch) | |
| tree | c38f830296eb36f0cf1792e84b74884a37606d20 | |
| parent | d818c949716d7c4b061eabe8d156d11c0ed97efc (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.
Pick-to: 6.4 6.3 6.2
Task-number: QTBUG-105913
Change-Id: Ic63e72a0b11bef55876ef5ca40d0c1d753243004
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch | 28 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch b/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch new file mode 100644 index 00000000..ec8bd4aa --- /dev/null +++ b/recipes-qt/qt5/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/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 783ca9ab..4e0d62f7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -36,6 +36,7 @@ SRC_URI += "\ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ file://0020-qbytearraymatcher-Include-limits-header.patch \ + file://0005-testlib-don-t-track-the-build-or-source-directories.patch \ " # Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with |