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/Squish4RunTestCase.bat | |
| 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/Squish4RunTestCase.bat')
| -rwxr-xr-x | Modules/Squish4RunTestCase.bat | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/Squish4RunTestCase.bat b/Modules/Squish4RunTestCase.bat index 5bd815a..fe303b8 100755 --- a/Modules/Squish4RunTestCase.bat +++ b/Modules/Squish4RunTestCase.bat @@ -4,7 +4,6 @@ set TESTSUITE=%3 set TESTCASE=%4 set AUT=%5 set AUTDIR=%6 -set SETTINGSGROUP=%7 %SQUISHSERVER% --stop @@ -14,7 +13,7 @@ echo "Adding AUT... %SQUISHSERVER% --config addAUT %AUT% %AUTDIR%" echo "Starting the squish server... %SQUISHSERVER%" start /B "Squish Server" %SQUISHSERVER% -echo "Running the test case...%SQUISHRUNNER% --testsuite %TESTSUITE% --testcase %TESTCASE%" +echo "Running the test case... %SQUISHRUNNER% --testsuite %TESTSUITE% --testcase %TESTCASE%" %SQUISHRUNNER% --testsuite "%TESTSUITE%" --testcase "%TESTCASE%" set returnValue=%ERRORLEVEL% |