Commit ec13bd52 authored by Brad King's avatar Brad King

Tests: Disable test that builds KWSys if not also building CMake

If `CMake_TEST_EXTERNAL_CMAKE` is enabled then the compiler with which
we are driving tests may not be able to compile CMake, so do not try
to compile KWSys with it either.
parent ded4bc13
...@@ -3272,12 +3272,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ...@@ -3272,12 +3272,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
--output-log "${CMake_BINARY_DIR}/Tests/CTestTest/testOutput.log" --output-log "${CMake_BINARY_DIR}/Tests/CTestTest/testOutput.log"
) )
configure_file("${CMake_SOURCE_DIR}/Tests/CTestTest2/test.cmake.in" if(NOT CMake_TEST_EXTERNAL_CMAKE)
"${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" @ONLY ESCAPE_QUOTES) configure_file("${CMake_SOURCE_DIR}/Tests/CTestTest2/test.cmake.in"
add_test(CTestTest2 ${CMAKE_CTEST_COMMAND} "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" @ONLY ESCAPE_QUOTES)
-S "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" -V add_test(CTestTest2 ${CMAKE_CTEST_COMMAND}
--output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log" -S "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" -V
) --output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
)
endif()
if("${CMAKE_GENERATOR}" MATCHES "Makefiles" OR "${CMAKE_GENERATOR}" MATCHES "Ninja") if("${CMAKE_GENERATOR}" MATCHES "Makefiles" OR "${CMAKE_GENERATOR}" MATCHES "Ninja")
configure_file("${CMake_SOURCE_DIR}/Tests/CTestTestLaunchers/test.cmake.in" configure_file("${CMake_SOURCE_DIR}/Tests/CTestTestLaunchers/test.cmake.in"
...@@ -3309,11 +3311,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ...@@ -3309,11 +3311,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
endif () endif ()
get_test_property(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT) if(NOT CMake_TEST_EXTERNAL_CMAKE)
if ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) get_test_property(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
set_tests_properties ( CTestTest2 if("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) set_tests_properties ( CTestTest2
endif () PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
endif()
endif()
endif () endif ()
if(CMake_TEST_EXTERNAL_CMAKE) if(CMake_TEST_EXTERNAL_CMAKE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment