From c00e4ac3f0cbda4473d8fe58acd1e35b799d252e Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Jun 2010 11:28:37 -0400 Subject: [PATCH 1/2] From 829fa09a262cb79e95975d8942c8e406c008397f Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Jun 2010 11:23:19 -0400 Subject: [PATCH 1/2] KWSys: Use short fallback timeout for Process tests If any of the KWSys Process tests take more than a minute or two then something is wrong. There is no need to wait for a long default timeout. --- Source/kwsys/CMakeLists.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 083629a..bdf6613 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -1097,6 +1097,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) FOREACH(n 1 2 3 4 5 6 ${KWSYS_TEST_PROCESS_7}) ADD_TEST(kwsys.testProcess-${n} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestProcess ${n}) KWSYS_SET_PROPERTY(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST}) + SET_TESTS_PROPERTIES(kwsys.testProcess-${n} PROPERTIES TIMEOUT 120) ENDFOREACH(n) # Some Apple compilers produce bad optimizations in this source. -- 1.7.0 --- Source/kwsys/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 083629ac3..bdf66131a 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -1097,6 +1097,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) FOREACH(n 1 2 3 4 5 6 ${KWSYS_TEST_PROCESS_7}) ADD_TEST(kwsys.testProcess-${n} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestProcess ${n}) KWSYS_SET_PROPERTY(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST}) + SET_TESTS_PROPERTIES(kwsys.testProcess-${n} PROPERTIES TIMEOUT 120) ENDFOREACH(n) # Some Apple compilers produce bad optimizations in this source. From 26ea271b0f560e40cc9d0f1cdc55c73d1863172c Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Jun 2010 11:28:56 -0400 Subject: [PATCH 2/2] From 83cf3fa2fe65b99758899463ca25941eb3fb3989 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 30 Jun 2010 11:25:42 -0400 Subject: [PATCH 2/2] KWSys: Optionally suppress consistent test failures Add option KWSYS_TEST_BOGUS_FAILURES that can be set by a containing project or in the CMake cache to list tests known to fail consistently on a buggy system. --- Source/kwsys/CMakeLists.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index bdf6613..bcc7a96 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -1125,5 +1125,11 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES MEASUREMENT "Some Key=Some Value") MESSAGE(STATUS "GET_TEST_PROPERTY returned: ${wfv}") ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY AND KWSYS_STANDALONE) + + # Suppress known consistent failures on buggy systems. + IF(KWSYS_TEST_BOGUS_FAILURES) + SET_TESTS_PROPERTIES(${KWSYS_TEST_BOGUS_FAILURES} PROPERTIES WILL_FAIL ON) + ENDIF() + ENDIF(BUILD_TESTING) ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) -- 1.7.0 --- Source/kwsys/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index bdf66131a..bcc7a961c 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -1125,5 +1125,11 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES MEASUREMENT "Some Key=Some Value") MESSAGE(STATUS "GET_TEST_PROPERTY returned: ${wfv}") ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY AND KWSYS_STANDALONE) + + # Suppress known consistent failures on buggy systems. + IF(KWSYS_TEST_BOGUS_FAILURES) + SET_TESTS_PROPERTIES(${KWSYS_TEST_BOGUS_FAILURES} PROPERTIES WILL_FAIL ON) + ENDIF() + ENDIF(BUILD_TESTING) ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)