diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-22 12:34:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-22 12:34:24 (GMT) |
| commit | 370def7b3e3205ba47c0634ab99f8cdf28ff4dae (patch) | |
| tree | 293bcecfae9b4023886e2c9afd6c2c3fcc109733 /Modules | |
| parent | acecd76f03ce6c137f72840a1aa6ef6e34f79f67 (diff) | |
| parent | c77c92791c3a1d80e691c70b6018e51bdcf4e465 (diff) | |
| download | CMake-370def7b3e3205ba47c0634ab99f8cdf28ff4dae.zip CMake-370def7b3e3205ba47c0634ab99f8cdf28ff4dae.tar.gz CMake-370def7b3e3205ba47c0634ab99f8cdf28ff4dae.tar.bz2 | |
Merge topic 'FindSquish-windows'
c77c92791c FindSquish: Fix setting the application under test
879b279154 FindSquish: Fix launching the Squish server process on Windows
0bc4fa2be2 FindSquish: Fix finding on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4620
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindSquish.cmake | 15 | ||||
| -rwxr-xr-x | Modules/Squish4RunTestCase.bat | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index 7d49505..eec8876 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -137,7 +137,8 @@ if(NOT SQUISH_INSTALL_DIR) string(REPLACE "//" "/" SQUISH_INSTALL_DIR_SEARCH "${SQUISH_INSTALL_DIR_SEARCH}") # Look for an installation - find_path(SQUISH_INSTALL_DIR bin/squishrunner + find_path(SQUISH_INSTALL_DIR + NAMES bin/squishrunner bin/squishrunner.exe HINTS # Look for an environment variable SQUISH_INSTALL_DIR. ENV SQUISH_INSTALL_DIR @@ -259,10 +260,6 @@ function(SQUISH_V4_ADD_TEST testName) message(FATAL_ERROR "Required argument TEST not given for SQUISH_ADD_TEST()") endif() - get_target_property(testAUTLocation ${_SQUISH_AUT} LOCATION) - get_filename_component(testAUTDir ${testAUTLocation} PATH) - get_filename_component(testAUTName ${testAUTLocation} NAME) - get_filename_component(absTestSuite "${_SQUISH_SUITE}" ABSOLUTE) if(NOT EXISTS "${absTestSuite}") message(FATAL_ERROR "Could not find squish test suite ${_SQUISH_SUITE} (checked ${absTestSuite})") @@ -277,11 +274,11 @@ function(SQUISH_V4_ADD_TEST testName) set(_SQUISH_SETTINGSGROUP "CTest_$ENV{LOGNAME}") endif() - add_test(${testName} - ${CMAKE_COMMAND} -V -VV + add_test(NAME ${testName} + COMMAND ${CMAKE_COMMAND} -V -VV "-Dsquish_version:STRING=4" - "-Dsquish_aut:STRING=${testAUTName}" - "-Dsquish_aut_dir:STRING=${testAUTDir}" + "-Dsquish_aut:STRING=$<TARGET_FILE_NAME:${_SQUISH_AUT}>" + "-Dsquish_aut_dir:STRING=$<TARGET_FILE_DIR:${_SQUISH_AUT}>" "-Dsquish_server_executable:STRING=${SQUISH_SERVER_EXECUTABLE}" "-Dsquish_client_executable:STRING=${SQUISH_CLIENT_EXECUTABLE}" "-Dsquish_libqtdir:STRING=${QT_LIBRARY_DIR}" diff --git a/Modules/Squish4RunTestCase.bat b/Modules/Squish4RunTestCase.bat index ad1cc8c..5bd815a 100755 --- a/Modules/Squish4RunTestCase.bat +++ b/Modules/Squish4RunTestCase.bat @@ -12,7 +12,7 @@ echo "Adding AUT... %SQUISHSERVER% --config addAUT %AUT% %AUTDIR%" %SQUISHSERVER% --config addAUT "%AUT%" "%AUTDIR%" echo "Starting the squish server... %SQUISHSERVER%" -start /B %SQUISHSERVER% +start /B "Squish Server" %SQUISHSERVER% echo "Running the test case...%SQUISHRUNNER% --testsuite %TESTSUITE% --testcase %TESTCASE%" %SQUISHRUNNER% --testsuite "%TESTSUITE%" --testcase "%TESTCASE%" |