From ee28daa3a5e7381d0095c63da8d1cedf804c35e1 Mon Sep 17 00:00:00 2001
From: "bgschaid@ice-sf.at" <bgschaid@ice-sf.at>
Date: Fri, 16 May 2014 10:00:07 +0000
Subject: [PATCH] Improve BUILDNAME in case of mercurial. Collateral damage:
 Timeout consistent

---
 CMakeLists.txt                                      | 13 +++++++------
 .../foam-extend/3.0/CMakeFiles/CMakeLists.txt       |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e95ddf703..9370cea75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,10 +96,10 @@ SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
 #    DART_TESTING_TIMEOUT 14400
 #    CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test."
 #)
-# Timeout for running all this: 10 minutes : 600 seconds
+# Timeout for running all this: 20 minutes : 1200 seconds (for debug)
 SET(
-    DART_TESTING_TIMEOUT 600
-    CACHE STRING "Maximum time allowed (10 minutes) before CTest will kill the test."
+    DART_TESTING_TIMEOUT 1200
+    CACHE STRING "Maximum time allowed (20 minutes) before CTest will kill the test."
 )
 
 SET(
@@ -127,12 +127,14 @@ if(GIT_FOUND)
     if (GIT_BRANCH_NAME STREQUAL "")
        message("No git-branch. Mercurial?")
        EXEC_PROGRAM(hg
-         ARGS branch
+     ARGS id
          OUTPUT_VARIABLE GIT_BRANCH_NAME
        )
        message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
     endif()
-    SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
+    SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'")
+    string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
+    string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME})
 endif()
 
 # Some last minute cleanup
@@ -140,7 +142,6 @@ endif()
 string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
 string(REPLACE "/" "_" SITE ${SITE})
 
-
 # Build section
 #-----------------------------------------------------------------------------
 
diff --git a/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt
index 75806c63d..9370cea75 100644
--- a/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt
+++ b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt
@@ -127,12 +127,14 @@ if(GIT_FOUND)
     if (GIT_BRANCH_NAME STREQUAL "")
        message("No git-branch. Mercurial?")
        EXEC_PROGRAM(hg
-     ARGS branch
+     ARGS id
          OUTPUT_VARIABLE GIT_BRANCH_NAME
        )
        message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
     endif()
-    SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
+    SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'")
+    string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
+    string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME})
 endif()
 
 # Some last minute cleanup
@@ -140,7 +142,6 @@ endif()
 string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
 string(REPLACE "/" "_" SITE ${SITE})
 
-
 # Build section
 #-----------------------------------------------------------------------------