summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-27 13:42:48 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-06-27 13:42:48 (GMT)
commit798d7626a01296bf6af6f8c2e1d1457faf665543 (patch)
tree340d178f9304a51cf4477e2dcbdfc6782308489a
parent55bba3a197d5727478aaac4c0e93801dcd0e8f1d (diff)
parenta73373a8c8ca261398b605572c6e23936496056d (diff)
downloadCMake-798d7626a01296bf6af6f8c2e1d1457faf665543.zip
CMake-798d7626a01296bf6af6f8c2e1d1457faf665543.tar.gz
CMake-798d7626a01296bf6af6f8c2e1d1457faf665543.tar.bz2
Merge topic 'CTestTestTimeout-increase'
a73373a8 CTestTestTimeout: increase the timeout for all platforms
-rw-r--r--Tests/CTestTestTimeout/CMakeLists.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/Tests/CTestTestTimeout/CMakeLists.txt b/Tests/CTestTestTimeout/CMakeLists.txt
index 2e3bd6a..c6cbc47 100644
--- a/Tests/CTestTestTimeout/CMakeLists.txt
+++ b/Tests/CTestTestTimeout/CMakeLists.txt
@@ -3,11 +3,8 @@ project(CTestTestTimeout)
include(CTest)
if(NOT TIMEOUT)
- if(CYGWIN)
- set(TIMEOUT 4) # Cygwin CMake sometimes takes > 1 second to load!
- else()
- set(TIMEOUT 1)
- endif()
+ # Give the process time to load and start running.
+ set(TIMEOUT 4)
endif()
add_definitions(-DTIMEOUT=${TIMEOUT})