diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-03-06 20:41:54 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-07 05:04:32 +0000 |
| commit | 9a5cd7d92b66914ebbd209d3279ebb3236e68c37 (patch) | |
| tree | 9a53c27b30e34f691c6d188eafc7125c409d33db /CMakeLists.txt | |
| parent | 5e67ae78baad06e9d5094b6536786b78cb441cc3 (diff) | |
Fix the exec call and paths in the test wrapper.
Change-Id: Ie36e9c7dc9a60715248aea300cffde8040cb0768
Reviewed-on: https://code.wireshark.org/review/7574
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a19deae15a..74e7dfa44b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2245,20 +2245,13 @@ if(ENABLE_APPLICATION_BUNDLE) set(TEST_SH_BIN_DIR ${CMAKE_BINARY_DIR}/run) else() set(TEST_SH_BIN_DIR $<TARGET_FILE_DIR:epan>) - if (NOT "${CYGPATH_EXECUTABLE}" STREQUAL "CYGPATH_EXECUTABLE-NOTFOUND") - execute_process( - COMMAND ${CYGPATH_EXECUTABLE} -u ${TEST_SH_BIN_DIR} - OUTPUT_VARIABLE _cygwin_path - ) - string(STRIP "${_cygwin_path}" _cygwin_path) - set(TEST_SH_BIN_DIR ${_cygwin_path}) - endif() endif() add_custom_target(test-sh ALL COMMAND ${CMAKE_COMMAND} + -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DTEST_SH_BIN_DIR=${TEST_SH_BIN_DIR} - -DTEST_SH_DIR=${CMAKE_SOURCE_DIR}/test + -DTEST_SH_SRC_DIR=${CMAKE_SOURCE_DIR}/test -P ${CMAKE_SOURCE_DIR}/cmake/modules/GenerateTestSh.cmake DEPENDS ${CMAKE_SOURCE_DIR}/cmake/modules/GenerateTestSh.cmake ) |