Updates will be applied - 3:30pm EDT (UTC -500). No downtime expected.

Commit a1860aaf authored by David Cole's avatar David Cole Committed by Kitware Robot

Merge topic 'test-CMakeCommands'

5e1a5c44 Add infrastructure for CMakeCommands tests
parents 2fb1df42 5e1a5c44
macro(add_CMakeCommands_test test)
add_test(CMakeCommands.${test} ${CMAKE_CMAKE_COMMAND}
-DCMake_SOURCE_DIR=${CMake_SOURCE_DIR} # TODO: Remove
-Ddir=${CMAKE_CURRENT_BINARY_DIR}/${test}
-Dgen=${CMAKE_TEST_GENERATOR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/test.cmake"
)
endmacro()
add_CMakeCommands_test(build_command)
......@@ -53,6 +53,7 @@ IF(BUILD_TESTING)
ADD_SUBDIRECTORY(CMakeLib)
ADD_SUBDIRECTORY(CMakeOnly)
ADD_SUBDIRECTORY(CMakeCommands)
ADD_SUBDIRECTORY(FindPackageModeMakefileTest)
......@@ -1710,13 +1711,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
add_config_tests(Release)
add_config_tests(RelWithDebInfo)
add_test(CMakeCommands.build_command ${CMAKE_CMAKE_COMMAND}
-DCMake_SOURCE_DIR=${CMake_SOURCE_DIR}
-Ddir=${CMake_BINARY_DIR}/Tests/CMakeCommands/build_command
-Dgen=${CMAKE_TEST_GENERATOR}
-P "${CMake_SOURCE_DIR}/Tests/CMakeCommands/build_command/RunCMake.cmake"
)
ADD_TEST_MACRO(CMakeCommands.target_link_libraries target_link_libraries)
CONFIGURE_FILE(
......
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