Tests: Drop CTestTestFailedSubmit-* tests
Everything they cover is now covered by RunCMake.ctest_submit test cases (except ctest_coverage LABELS which were not actually checked anyway). Drop these redundant tests.
This commit is contained in:
parent
ac80f0f95f
commit
b10310e6e6
|
@ -2743,48 +2743,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
|||
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/testOutput.log"
|
||||
)
|
||||
|
||||
function(add_failed_submit_test name source build in out log regex)
|
||||
configure_file("${in}" "${out}" @ONLY)
|
||||
add_test(${name} ${CMAKE_CTEST_COMMAND} -S "${out}" -V --output-log "${log}")
|
||||
set_tests_properties(${name} PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
|
||||
endfunction()
|
||||
|
||||
set(regex "(Problems when submitting via S*CP")
|
||||
set(regex "${regex}|Error message was: ")
|
||||
set(regex "${regex}([Cc]ould *n.t resolve host")
|
||||
set(regex "${regex}|[Cc]ould *n.t connect to host")
|
||||
set(regex "${regex}|Failed *t*o* connect to")
|
||||
set(regex "${regex}|Connection timed out after [0-9]+ milliseconds")
|
||||
set(regex "${regex}|Empty reply from server")
|
||||
set(regex "${regex}|The requested URL returned error")
|
||||
set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
|
||||
set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest")
|
||||
set(regex "${regex}|Submission problem")
|
||||
set(regex "${regex}|Submission successful)")
|
||||
|
||||
set(ctest_coverage_labels_args "")
|
||||
|
||||
foreach(drop_method cp ftp http https scp xmlrpc)
|
||||
# Cycle through these values each time through the loop:
|
||||
if(ctest_coverage_labels_args STREQUAL "")
|
||||
set(ctest_coverage_labels_args "LABELS Everything")
|
||||
elseif(ctest_coverage_labels_args STREQUAL "LABELS Everything")
|
||||
set(ctest_coverage_labels_args "LABELS 0ArgTest")
|
||||
else()
|
||||
set(ctest_coverage_labels_args "")
|
||||
endif()
|
||||
|
||||
add_failed_submit_test(CTestTestFailedSubmit-${drop_method}
|
||||
"${CMake_SOURCE_DIR}/Tests/CTestTest/SmallAndFast"
|
||||
"${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/${drop_method}"
|
||||
"${CMake_SOURCE_DIR}/Tests/CTestTestFailedSubmits/test.cmake.in"
|
||||
"${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/test-${drop_method}.cmake"
|
||||
"${CMake_BINARY_DIR}/Tests/CTestTestFailedSubmits/test-${drop_method}.log"
|
||||
"${regex}"
|
||||
)
|
||||
endforeach()
|
||||
|
||||
|
||||
if (CMAKE_TESTS_CDASH_SERVER)
|
||||
set(regex "^([^:]+)://([^/]+)(.*)$")
|
||||
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
cmake_minimum_required(VERSION 2.8)
|
||||
|
||||
# CTestConfig.cmake settings:
|
||||
set(CTEST_PROJECT_NAME "SmallAndFast")
|
||||
|
||||
# Intentionally leave out other upload-related CTestConfig.cmake settings
|
||||
# so that the ctest_submit call below fails with an error message...
|
||||
#
|
||||
set(CTEST_DROP_METHOD "@drop_method@")
|
||||
|
||||
# Settings:
|
||||
set(CTEST_USE_LAUNCHERS 1)
|
||||
|
||||
# Emit these compiler warnings:
|
||||
set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} -Wall")
|
||||
|
||||
set(CTEST_SITE "@SITE@")
|
||||
set(CTEST_BUILD_NAME "CTestTestLaunchers-@drop_method@")
|
||||
|
||||
set(CTEST_SOURCE_DIRECTORY "@source@")
|
||||
set(CTEST_BINARY_DIRECTORY "@build@")
|
||||
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
|
||||
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
|
||||
set(CTEST_CMAKE_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@")
|
||||
set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
|
||||
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
|
||||
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
|
||||
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
|
||||
|
||||
CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
|
||||
|
||||
CTEST_START(Experimental)
|
||||
|
||||
# explicitly do not use CTEST_UPDATE - avoid network activity
|
||||
|
||||
CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}"
|
||||
OPTIONS "-DCTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS};-DSAF_INTENTIONAL_COMPILE_ERROR:BOOL=ON;-DSAF_INTENTIONAL_COMPILE_WARNING:BOOL=ON"
|
||||
RETURN_VALUE res)
|
||||
CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||
CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||
CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" @ctest_coverage_labels_args@ RETURN_VALUE res)
|
||||
|
||||
# ok to call ctest_submit - still avoids network activity because there is
|
||||
# not a valid drop location given above...
|
||||
CTEST_SUBMIT(RETURN_VALUE res)
|
||||
|
||||
# Add coverage for the new APPEND arg to ctest_start:
|
||||
#
|
||||
CTEST_START(Experimental APPEND)
|
Loading…
Reference in New Issue