Skip to content

GitLab

Commit 9e017bd0 authored by FBerendsen's avatar FBerendsen
Browse files

WIP: corrected paths and -j4 flags

parent 4e9acf46
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 11 deletions
CTest.cmake
View file @ 9e017bd0
......@@ -18,7 +18,7 @@
#=========================================================================
# Directories relative to the build directory.
set(CTEST_SOURCE_DIRECTORY "../src")
set(CTEST_SOURCE_DIRECTORY "../../src")
set(CTEST_BINARY_DIRECTORY ".")
set(CTEST_SITE "lkeb-selx01")
......@@ -40,7 +40,7 @@ set(CTEST_BUILD_NAME "${SELX_GIT_BRANCH_NAME};Tests;commit=SHA\\:${SELX_GIT_COMM
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_BUILD_OPTIONS "-j4")
set(CTEST_BUILD_FLAGS "-j4")
set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} --build ${CTEST_BINARY_DIRECTORY}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DWITH_TESTING:BOOL=ON ${CTEST_BUILD_OPTIONS}")
......@@ -49,6 +49,4 @@ set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTO
ctest_start("Nightly")
ctest_test()
set( submit_return_value )
ctest_submit( PARTS ctest_test RETURN_VALUE submit_return_value)
message(STATUS "submit_return_value: " ${submit_return_value} )
\ No newline at end of file
ctest_submit( PARTS Test )
SuperBuild/CTest.cmake
View file @ 9e017bd0
......@@ -18,7 +18,7 @@
#=========================================================================
# Directories relative to the build directory.
set(CTEST_SOURCE_DIRECTORY "../src")
set(CTEST_SOURCE_DIRECTORY "../src/SuperBuild")
set(CTEST_BINARY_DIRECTORY ".")
set(CTEST_SITE "lkeb-selx01")
......@@ -40,16 +40,15 @@ set(CTEST_BUILD_NAME "${SELX_GIT_BRANCH_NAME};Build;commit=SHA\\:${SELX_GIT_COMM
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_BUILD_OPTIONS "-j4")
set(CTEST_BUILD_FLAGS "-j4")
set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} --build ${CTEST_BINARY_DIRECTORY}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DWITH_TESTING:BOOL=ON ${CTEST_BUILD_OPTIONS}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\"")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"../${CTEST_SOURCE_DIRECTORY}\"")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
ctest_start("Nightly")
ctest_configure()
ctest_build()
set( submit_return_value )
ctest_submit( PARTS Configure Build RETURN_VALUE submit_return_value)
message(STATUS "submit_return_value: " ${submit_return_value} )
ctest_submit( PARTS Configure Build )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment