From 7e063bdc97bcc0c2a54564bb07dbe76c94480d53 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Sat, 21 Jan 2023 12:12:34 +0100 Subject: Fix the broken tests after the retirement of qt_parse_all_arguments As we are now processing the arguments with cmake_parse_arguments(PARSE_ARGV, we don't need to pass the escape characters anymore. Task-number: QTBUG-99238 Change-Id: Ib2c8930b5a747140c0c8b877f994db083ad7bec6 Reviewed-by: Alexey Edelev --- src/3rdparty/libarchive/CMakeLists.txt | 12 ++++++------ src/main-lib/CMakeLists.txt | 2 +- tests/auto/application/CMakeLists.txt | 2 +- tests/auto/applicationinstaller/CMakeLists.txt | 2 +- tests/auto/configuration/CMakeLists.txt | 2 +- tests/auto/cryptography/CMakeLists.txt | 2 +- tests/auto/debugwrapper/CMakeLists.txt | 2 +- tests/auto/installationreport/CMakeLists.txt | 2 +- tests/auto/main/CMakeLists.txt | 2 +- tests/auto/packagecreator/CMakeLists.txt | 2 +- tests/auto/packageextractor/CMakeLists.txt | 2 +- tests/auto/packager-tool/CMakeLists.txt | 2 +- tests/auto/processreader/CMakeLists.txt | 2 +- tests/auto/runtime/CMakeLists.txt | 2 +- tests/auto/signature/CMakeLists.txt | 2 +- tests/auto/sudo/CMakeLists.txt | 2 +- tests/auto/utilities/CMakeLists.txt | 2 +- tests/auto/yaml/CMakeLists.txt | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/3rdparty/libarchive/CMakeLists.txt b/src/3rdparty/libarchive/CMakeLists.txt index 7e6c9a48..def1e058 100644 --- a/src/3rdparty/libarchive/CMakeLists.txt +++ b/src/3rdparty/libarchive/CMakeLists.txt @@ -82,7 +82,7 @@ qt_set_symbol_visibility_hidden(BundledLibArchive) qt_internal_extend_target(BundledLibArchive CONDITION MACOS DEFINES - PLATFORM_CONFIG_H=\\\"config-macos.h\\\" + PLATFORM_CONFIG_H="config-macos.h" PUBLIC_LIBRARIES ${FWCoreServices} ) @@ -100,7 +100,7 @@ qt_internal_extend_target(BundledLibArchive CONDITION WIN32 libarchive/archive_write_disk_windows.c libarchive/filter_fork_windows.c DEFINES - PLATFORM_CONFIG_H=\\\"config-windows.h\\\" + PLATFORM_CONFIG_H="config-windows.h" PUBLIC_DEFINES LIBARCHIVE_STATIC PUBLIC_LIBRARIES @@ -110,22 +110,22 @@ qt_internal_extend_target(BundledLibArchive CONDITION WIN32 qt_internal_extend_target(BundledLibArchive CONDITION ANDROID DEFINES - PLATFORM_CONFIG_H=\\\"config-android.h\\\" + PLATFORM_CONFIG_H="config-android.h" ) qt_internal_extend_target(BundledLibArchive CONDITION IOS AND NOT MACOS DEFINES - PLATFORM_CONFIG_H=\\\"config-ios.h\\\" + PLATFORM_CONFIG_H="config-ios.h" ) qt_internal_extend_target(BundledLibArchive CONDITION QNX DEFINES - PLATFORM_CONFIG_H=\\\"config-qnx.h\\\" + PLATFORM_CONFIG_H="config-qnx.h" ) qt_internal_extend_target(BundledLibArchive CONDITION UNIX AND NOT ANDROID AND NOT IOS AND NOT MACOS AND NOT QNX DEFINES - PLATFORM_CONFIG_H=\\\"config-unix.h\\\" + PLATFORM_CONFIG_H="config-unix.h" ) qt_internal_extend_target(BundledLibArchive CONDITION UNIX diff --git a/src/main-lib/CMakeLists.txt b/src/main-lib/CMakeLists.txt index a9a40ab6..26ff74e0 100644 --- a/src/main-lib/CMakeLists.txt +++ b/src/main-lib/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_module(AppManMainPrivate main.cpp main.h windowframetimer.cpp windowframetimer.h DEFINES - AM_BUILD_DIR=\\\"\\\" + AM_BUILD_DIR="" PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate diff --git a/tests/auto/application/CMakeLists.txt b/tests/auto/application/CMakeLists.txt index 439d3fd4..97eb9d1a 100644 --- a/tests/auto/application/CMakeLists.txt +++ b/tests/auto/application/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_application ../error-checking.h tst_application.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManApplicationPrivate diff --git a/tests/auto/applicationinstaller/CMakeLists.txt b/tests/auto/applicationinstaller/CMakeLists.txt index 8606e3c6..912f641e 100644 --- a/tests/auto/applicationinstaller/CMakeLists.txt +++ b/tests/auto/applicationinstaller/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_applicationinstaller ../error-checking.h tst_applicationinstaller.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManApplicationPrivate diff --git a/tests/auto/configuration/CMakeLists.txt b/tests/auto/configuration/CMakeLists.txt index d7769e62..62c1f835 100644 --- a/tests/auto/configuration/CMakeLists.txt +++ b/tests/auto/configuration/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_configuration ../error-checking.h tst_configuration.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManCommonPrivate diff --git a/tests/auto/cryptography/CMakeLists.txt b/tests/auto/cryptography/CMakeLists.txt index 5d3657fc..6793a2f0 100644 --- a/tests/auto/cryptography/CMakeLists.txt +++ b/tests/auto/cryptography/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_cryptography ../error-checking.h tst_cryptography.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManCommonPrivate diff --git a/tests/auto/debugwrapper/CMakeLists.txt b/tests/auto/debugwrapper/CMakeLists.txt index 7c6d27ca..79af4ccc 100644 --- a/tests/auto/debugwrapper/CMakeLists.txt +++ b/tests/auto/debugwrapper/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_debugwrapper ../error-checking.h tst_debugwrapper.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManManagerPrivate diff --git a/tests/auto/installationreport/CMakeLists.txt b/tests/auto/installationreport/CMakeLists.txt index 8b160b3f..34162804 100644 --- a/tests/auto/installationreport/CMakeLists.txt +++ b/tests/auto/installationreport/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_installationreport ../error-checking.h tst_installationreport.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManApplicationPrivate diff --git a/tests/auto/main/CMakeLists.txt b/tests/auto/main/CMakeLists.txt index f4614d3f..bc2b9696 100644 --- a/tests/auto/main/CMakeLists.txt +++ b/tests/auto/main/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_main ../error-checking.h tst_main.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManApplicationPrivate diff --git a/tests/auto/packagecreator/CMakeLists.txt b/tests/auto/packagecreator/CMakeLists.txt index 844a7dcd..eabb9049 100644 --- a/tests/auto/packagecreator/CMakeLists.txt +++ b/tests/auto/packagecreator/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_packagecreator ../error-checking.h tst_packagecreator.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManApplicationPrivate diff --git a/tests/auto/packageextractor/CMakeLists.txt b/tests/auto/packageextractor/CMakeLists.txt index 7bbdcb7b..9bf7a26e 100644 --- a/tests/auto/packageextractor/CMakeLists.txt +++ b/tests/auto/packageextractor/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_packageextractor ../error-checking.h tst_packageextractor.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManApplicationPrivate diff --git a/tests/auto/packager-tool/CMakeLists.txt b/tests/auto/packager-tool/CMakeLists.txt index 78c0152c..4d646a2d 100644 --- a/tests/auto/packager-tool/CMakeLists.txt +++ b/tests/auto/packager-tool/CMakeLists.txt @@ -5,7 +5,7 @@ qt_internal_add_test(tst_packager-tool ../error-checking.h tst_packager-tool.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" INCLUDE_DIRECTORIES ../../../src/tools/packager LIBRARIES diff --git a/tests/auto/processreader/CMakeLists.txt b/tests/auto/processreader/CMakeLists.txt index e3a245c8..44eb995f 100644 --- a/tests/auto/processreader/CMakeLists.txt +++ b/tests/auto/processreader/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_processreader ../error-checking.h tst_processreader.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManApplicationPrivate diff --git a/tests/auto/runtime/CMakeLists.txt b/tests/auto/runtime/CMakeLists.txt index 65237c88..01e1f9d8 100644 --- a/tests/auto/runtime/CMakeLists.txt +++ b/tests/auto/runtime/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_runtime ../error-checking.h tst_runtime.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::Qml diff --git a/tests/auto/signature/CMakeLists.txt b/tests/auto/signature/CMakeLists.txt index 3dc499a4..79020a69 100644 --- a/tests/auto/signature/CMakeLists.txt +++ b/tests/auto/signature/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_signature ../error-checking.h tst_signature.cpp DEFINES - AM_TESTSOURCE_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + AM_TESTSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" LIBRARIES Qt::Network Qt::AppManCommonPrivate diff --git a/tests/auto/sudo/CMakeLists.txt b/tests/auto/sudo/CMakeLists.txt index 3ca61b57..4b90f34a 100644 --- a/tests/auto/sudo/CMakeLists.txt +++ b/tests/auto/sudo/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_sudo ../error-checking.h tst_sudo.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManCommonPrivate diff --git a/tests/auto/utilities/CMakeLists.txt b/tests/auto/utilities/CMakeLists.txt index 6098c49d..7e202ebe 100644 --- a/tests/auto/utilities/CMakeLists.txt +++ b/tests/auto/utilities/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_utilities ../error-checking.h tst_utilities.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManCommonPrivate diff --git a/tests/auto/yaml/CMakeLists.txt b/tests/auto/yaml/CMakeLists.txt index 9337329b..575f54e3 100644 --- a/tests/auto/yaml/CMakeLists.txt +++ b/tests/auto/yaml/CMakeLists.txt @@ -4,7 +4,7 @@ qt_internal_add_test(tst_yaml ../error-checking.h tst_yaml.cpp DEFINES - AM_TESTDATA_DIR=\\\"${CMAKE_CURRENT_BINARY_DIR}/../../data/\\\" + AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/" LIBRARIES Qt::Network Qt::AppManCommonPrivate -- cgit v1.2.1