Skip to content
Snippets Groups Projects
Commit 135d18f0 authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Fix build type for merge request

This change is needed for proper display on CDash.
parent f0eb1974
No related branches found
No related tags found
Loading
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment