diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2022-03-05 03:07:38 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2022-03-21 16:41:48 +0000 |
| commit | 5a3290462d617c63660ddebc94cf122cb1dc6eed (patch) | |
| tree | 06089f0abf444df34b6a2116567803e776435f0f /src/main-lib | |
| parent | 3af34ee549f6514a3396b196edc6b8415c8db3af (diff) | |
| download | qtapplicationmanager-5a3290462d617c63660ddebc94cf122cb1dc6eed.tar.gz | |
Re-enable running autotests on macOS
We could theoretically also run them on Windows now, but the tst_main
test non-deterministically freezes regardless of compiler (MSVC or MingW)
and OS (Win 10 or Win 11).
Change-Id: Ic55063e277ab28ec087cf644e5007744f9f2303a
Pick-to: 6.3 6.3.0
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/main-lib')
| -rw-r--r-- | src/main-lib/Qt6AppManMainPrivateMacros.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main-lib/Qt6AppManMainPrivateMacros.cmake b/src/main-lib/Qt6AppManMainPrivateMacros.cmake index 2d8aef0c..3b0c5653 100644 --- a/src/main-lib/Qt6AppManMainPrivateMacros.cmake +++ b/src/main-lib/Qt6AppManMainPrivateMacros.cmake @@ -77,9 +77,9 @@ function(qt6_am_add_systemui_wrapper target) file(GENERATE OUTPUT ${WRAPPER_SCRIPT} CONTENT "@echo off SetLocal EnableDelayedExpansion -(set PATH=${test_env_path};%PATH%) -(set QT_PLUGIN_PATH=${test_env_plugin_path}) -$<TARGET_FILE_NAME:${ARG_EXECUTABLE}> ${CMD_ARGS_STR} ${CMD_EXTRA_ARGS_STR} ${ARG_MAIN_QML_FILE} %* +(set \"PATH=${test_env_path};%PATH%\") +(set \"QT_PLUGIN_PATH=${test_env_plugin_path}\") +$<SHELL_PATH:$<TARGET_FILE:${ARG_EXECUTABLE}>> ${CMD_ARGS_STR} ${CMD_EXTRA_ARGS_STR} ${ARG_MAIN_QML_FILE} %* EndLocal " ) @@ -88,8 +88,8 @@ EndLocal set(WRAPPER_SCRIPT "_${target}$<CONFIG>${WRAPPER_SUFFIX}") file(GENERATE OUTPUT ${WRAPPER_SCRIPT} CONTENT "#!/bin/sh -export PATH=${test_env_path}:$PATH -export QT_PLUGIN_PATH=${test_env_plugin_path} +export PATH=\"${test_env_path}:$PATH\" +export QT_PLUGIN_PATH=\"${test_env_plugin_path}\" exec $<TARGET_FILE_NAME:${ARG_EXECUTABLE}> ${CMD_ARGS_STR} ${CMD_EXTRA_ARGS_STR} ${ARG_MAIN_QML_FILE} \"$@\"; " ) |