Use macro instead of function since DASH2 continuous dashboard still uses CMake 2.4.8 to drive the dashboard. Add clarifying comments so that a future developer does not delete seemingly unused variables: they are used: inside the input to the configure_file call.
This commit is contained in:
parent
2137955138
commit
a85ac1a734
|
@ -1113,11 +1113,20 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
|
||||||
ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N)
|
ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N)
|
||||||
|
|
||||||
|
|
||||||
function(add_failed_submit_test name source build in out log regex)
|
# Use macro, not function so that build can still be driven by CMake 2.4.
|
||||||
|
# After 2.6 is required, this could be a function without the extra 'set'
|
||||||
|
# calls.
|
||||||
|
#
|
||||||
|
macro(add_failed_submit_test name source build in out log regex)
|
||||||
|
# Have variables named source, build and drop_method because the
|
||||||
|
# configure_file call expects those variables to be defined.
|
||||||
|
#
|
||||||
|
set(source "${source}")
|
||||||
|
set(build "${build}")
|
||||||
configure_file("${in}" "${out}" @ONLY)
|
configure_file("${in}" "${out}" @ONLY)
|
||||||
add_test(${name} ${CMAKE_CTEST_COMMAND} -S "${out}" -V --output-log "${log}")
|
add_test(${name} ${CMAKE_CTEST_COMMAND} -S "${out}" -V --output-log "${log}")
|
||||||
set_tests_properties(${name} PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
|
set_tests_properties(${name} PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
|
||||||
endfunction()
|
endmacro()
|
||||||
|
|
||||||
set(regex "(Problems when submitting via S*CP")
|
set(regex "(Problems when submitting via S*CP")
|
||||||
set(regex "${regex}|Error message was: ")
|
set(regex "${regex}|Error message was: ")
|
||||||
|
|
Loading…
Reference in New Issue