From d30a1274b2db10934a149cbe73a25b048bf7051c Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 30 Dec 2011 10:33:28 -0500
Subject: [svn-r21853] Updated cdash variables for use with CTestScript.cmake
 processing.

Tested: windows
---
 CTestConfig.cmake        |  9 ++++++---
 config/cmake/CTest.cmake | 15 +++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index c64153d..872b728 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -21,7 +21,10 @@ SET (UPDATE_TYPE svn)
 SET (VALGRIND_COMMAND "/usr/bin/valgrind")
 SET (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
 
-SET (CTEST_TESTING_TIMEOUT 3600) 
-SET (DART_TESTING_TIMEOUT 3600)
+SET (CTEST_TESTING_TIMEOUT 3600 CACHE STRING 
+    "Maximum time allowed before CTest will kill the test.") 
+SET (DART_TESTING_TIMEOUT 3600 CACHE STRING 
+    "Maximum time allowed before CTest will kill the test.")
 
-SET (CTEST_SUBMIT_RETRY_DELAY 20)
+SET(CTEST_SUBMIT_RETRY_DELAY 20 CACHE STRING
+    "How long to wait between timed-out CTest submissions.")
diff --git a/config/cmake/CTest.cmake b/config/cmake/CTest.cmake
index c69166c..178e2ae 100644
--- a/config/cmake/CTest.cmake
+++ b/config/cmake/CTest.cmake
@@ -225,15 +225,14 @@ IF(BUILD_TESTING)
     IF(DART_CXX_NAME MATCHES "devenv")
       GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_CXX_NAME)
     ENDIF(DART_CXX_NAME MATCHES "devenv")
-    IF (SYSTEM_NAME_EXT)
-      SET (BUILD_NAME_SYSTEM_NAME "${BUILD_NAME_SYSTEM_NAME}_${SYSTEM_NAME_EXT}")
-    ENDIF (SYSTEM_NAME_EXT)
-    IF(BUILD_NAME_EXT)
-      SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}-${BUILD_NAME_EXT}")
-    ELSE(BUILD_NAME_EXT)
-      SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
-    ENDIF( BUILD_NAME_EXT)
+    SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
   ENDIF(NOT BUILDNAME)
+  IF (SYSTEM_NAME_EXT)
+    SET (BUILDNAME "${BUILDNAME}_${SYSTEM_NAME_EXT}")
+  ENDIF (SYSTEM_NAME_EXT)
+  IF(BUILD_NAME_EXT)
+    SET(BUILDNAME "${BUILDNAME}-${BUILD_NAME_EXT}")
+  ENDIF(BUILD_NAME_EXT)
 
   # the build command
   BUILD_COMMAND(MAKECOMMAND_DEFAULT_VALUE
-- 
cgit v0.12