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/FindSquish.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/FindSquish.cmake')
| -rw-r--r-- | Modules/FindSquish.cmake | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index 16f5ab8..91d1410 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -65,8 +65,7 @@ The arguments have the following meaning: the name of the squish test, i.e. the name of the subdirectory of the test inside the suite directory. ``SETTINGSGROUP group`` - if specified, the given settings group will be used for executing the test. - If not specified, the groupname will be "CTest_<username>" + deprecated, this argument will be ignored. ``PRE_COMMAND command`` if specified, the given command will be executed before starting the squish test. ``POST_COMMAND command`` @@ -83,7 +82,6 @@ The arguments have the following meaning: AUT myApp SUITE ${CMAKE_SOURCE_DIR}/tests/mySuite TEST someSquishTest - SETTINGSGROUP myGroup ) endif () @@ -255,8 +253,8 @@ function(squish_v4_add_test testName) message(FATAL_ERROR "Could not find squish testcase ${_SQUISH_TEST} (checked ${absTestCase})") endif() - if(NOT _SQUISH_SETTINGSGROUP) - set(_SQUISH_SETTINGSGROUP "CTest_$ENV{LOGNAME}") + if(_SQUISH_SETTINGSGROUP) + message("SETTINGSGROUP is deprecated and will be ignored.") endif() add_test(NAME ${testName} @@ -272,7 +270,6 @@ function(squish_v4_add_test testName) "-Dsquish_env_vars:STRING=${envVars}" "-Dsquish_wrapper:STRING=${testWraper}" "-Dsquish_module_dir:STRING=${_SQUISH_MODULE_DIR}" - "-Dsquish_settingsgroup:STRING=${_SQUISH_SETTINGSGROUP}" "-Dsquish_pre_command:STRING=${_SQUISH_PRE_COMMAND}" "-Dsquish_post_command:STRING=${_SQUISH_POST_COMMAND}" -P "${_SQUISH_MODULE_DIR}/SquishTestScript.cmake" |