diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-04 16:28:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-04 16:28:14 (GMT) |
| commit | ac16778a129fc1076d41490919b63a207591ebf1 (patch) | |
| tree | f7d1fd4ed30790e3d9b92e743edb82ec7d0dc309 | |
| parent | 0a68c30b81020dde3f149d9b02a598925d746d31 (diff) | |
| parent | c0f00079a9d00539b0ca132e8be8fe63b1eed65c (diff) | |
| download | CMake-ac16778a129fc1076d41490919b63a207591ebf1.zip CMake-ac16778a129fc1076d41490919b63a207591ebf1.tar.gz CMake-ac16778a129fc1076d41490919b63a207591ebf1.tar.bz2 | |
Merge topic 'ctest_xml_tweaks'
c0f00079a9 Tests: Fix RunCMake.ctest_update test to not require GIT_EXECUTABLE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3423
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_update/test.cmake.in | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 6e6b9f1..69f8162 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -259,7 +259,7 @@ add_RunCMake_test(ctest_submit) add_RunCMake_test(ctest_test) add_RunCMake_test(ctest_disabled_test) add_RunCMake_test(ctest_skipped_test) -add_RunCMake_test(ctest_update -DGIT_EXECUTABLE=${GIT_EXECUTABLE}) +add_RunCMake_test(ctest_update) add_RunCMake_test(ctest_upload) add_RunCMake_test(ctest_fixtures) add_RunCMake_test(file) diff --git a/Tests/RunCMake/ctest_update/test.cmake.in b/Tests/RunCMake/ctest_update/test.cmake.in index abbef74..25b8423 100644 --- a/Tests/RunCMake/ctest_update/test.cmake.in +++ b/Tests/RunCMake/ctest_update/test.cmake.in @@ -9,7 +9,9 @@ set(CTEST_CMAKE_GENERATOR "@RunCMake_GENERATOR@") set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") -set(CTEST_UPDATE_COMMAND "@GIT_EXECUTABLE@") + +# FIXME: update test to do someting meaningful with this. +set(CTEST_UPDATE_COMMAND "not-actually-used") set(ctest_test_args "@CASE_CTEST_UPDATE_ARGS@") ctest_start(Experimental) |