From 135d18f09433f7c97e97d813eb519644a0d59f9f Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 9 Jul 2020 13:56:31 +0200
Subject: [PATCH] Fix build type for merge request

This change is needed for proper display on CDash.
---
 CbmRoot_test.cmake | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/CbmRoot_test.cmake b/CbmRoot_test.cmake
index 2d6619c044..0184112f3f 100644
--- a/CbmRoot_test.cmake
+++ b/CbmRoot_test.cmake
@@ -8,10 +8,6 @@ Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
 
 Set(CTEST_UPDATE_COMMAND "git")
 
-#If($ENV{ctest_model} MATCHES Continuous)
-#  Set(CTEST_SVN_UPDATE_OPTIONS "$ENV{REVISION}")
-#EndIf($ENV{ctest_model} MATCHES Continuous)
-
 Set(BUILD_COMMAND "make")
 Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -i -k -j$ENV{number_of_processors}")
 
@@ -85,12 +81,17 @@ Configure_File(${CTEST_SOURCE_DIRECTORY}/CTestCustom.cmake
               )
 Ctest_Read_Custom_Files("${CTEST_BINARY_DIRECTORY}")
 
+If($ENV{ctest_model} MATCHES MergeRequest)
+  set(ENV{ctest_model} Continuous)
+EndIf()
+
 Ctest_Start($ENV{ctest_model})
 
-If($ENV{ctest_model} MATCHES Continuous OR $ENV{ctest_model} MATCHES MergeRequest)
+If($ENV{ctest_model} MATCHES Continuous)
   set(ENV{ctest_model} Nightly)
 EndIf()
 
+
 If(NOT $ENV{ctest_model} MATCHES Experimental)
   Ctest_Update(SOURCE "${CTEST_SOURCE_DIRECTORY}")
 EndIf()
-- 
GitLab