diff options
| author | Frederik Gladhorn <gladhorn@kde.org> | 2020-05-19 09:44:05 (GMT) |
|---|---|---|
| committer | Frederik Gladhorn <gladhorn@kde.org> | 2020-05-19 09:47:19 (GMT) |
| commit | 8492ac1363c264a87532f7ee9890be5e22b57b82 (patch) | |
| tree | 23a519a0626ce86ac90ee512197f9c4a483ea883 /Modules/SquishTestScript.cmake | |
| parent | cc79253fa4966ee11d0a7a086b82f75b93a6c569 (diff) | |
| download | CMake-8492ac1363c264a87532f7ee9890be5e22b57b82.zip CMake-8492ac1363c264a87532f7ee9890be5e22b57b82.tar.gz CMake-8492ac1363c264a87532f7ee9890be5e22b57b82.tar.bz2 | |
FindSquish: Remove settingsGroup argument
This argument never worked and was not passed on Windows, which is why
the Windows version needs fewer fixups (and used to work independent of
this change).
On Linux (and macOS) it was passed and prevented the server from starting and the
test would not be able to run.
See also comments on https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4648
Diffstat (limited to 'Modules/SquishTestScript.cmake')
| -rw-r--r-- | Modules/SquishTestScript.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/SquishTestScript.cmake b/Modules/SquishTestScript.cmake index 2a80be5..b0cb4af 100644 --- a/Modules/SquishTestScript.cmake +++ b/Modules/SquishTestScript.cmake @@ -31,7 +31,6 @@ message(STATUS "squish_test_case='${squish_test_case}'") message(STATUS "squish_wrapper='${squish_wrapper}'") message(STATUS "squish_env_vars='${squish_env_vars}'") message(STATUS "squish_module_dir='${squish_module_dir}'") -message(STATUS "squish_settingsgroup='${squish_settingsgroup}'") message(STATUS "squish_pre_command='${squish_pre_command}'") message(STATUS "squish_post_command='${squish_post_command}'") @@ -57,10 +56,10 @@ endif() # run the test if("${squish_version}" STREQUAL "4") if (WIN32) - execute_process(COMMAND ${squish_module_dir}/Squish4RunTestCase.bat ${squish_server_executable} ${squish_client_executable} ${squish_test_suite} ${squish_test_case} ${squish_aut} ${squish_aut_dir} ${squish_settingsgroup} + execute_process(COMMAND ${squish_module_dir}/Squish4RunTestCase.bat ${squish_server_executable} ${squish_client_executable} ${squish_test_suite} ${squish_test_case} ${squish_aut} ${squish_aut_dir} RESULT_VARIABLE test_rv ) elseif(UNIX) - execute_process(COMMAND ${squish_module_dir}/Squish4RunTestCase.sh ${squish_server_executable} ${squish_client_executable} ${squish_test_suite} ${squish_test_case} ${squish_aut} ${squish_aut_dir} ${squish_settingsgroup} + execute_process(COMMAND ${squish_module_dir}/Squish4RunTestCase.sh ${squish_server_executable} ${squish_client_executable} ${squish_test_suite} ${squish_test_case} ${squish_aut} ${squish_aut_dir} RESULT_VARIABLE test_rv ) endif () |