Commit 2db8aba1 authored by Emmanuel Promayon's avatar Emmanuel Promayon

FIXED syntax (get more verbosity for now)

parent 4228c80d
......@@ -103,7 +103,8 @@ if grep --quiet "Fatal error" $CI_PROJECT_DIR/$PROJECT_LOG_DIR/ci-test.log; then
-DCTEST_SOURCE_DIRECTORY="$PROJECT_SOURCE_DIR" \
-DCTEST_BINARY_DIRECTORY="$PROJECT_BUILD_DIR" \
-DRERUN_TESTNAME=$testname \
-S $PROJECT_SOURCE_DIR/sdk/cmake/ctest/ci-rerun.cmake > >(tee --append ${PROJECT_LOG_DIR}/rerun-test.log | grep --line-buffered -e "Test \#") 2>&1
-S $PROJECT_SOURCE_DIR/sdk/cmake/ctest/ci-rerun.cmake
## > >(tee --append ${PROJECT_LOG_DIR}/rerun-test.log | grep --line-buffered -e "Test \#") 2>&1
done
if grep --quiet "\*\*\*Failed" $CI_PROJECT_DIR/$PROJECT_LOG_DIR/rerun-test.log; then
echo
......
......@@ -8,6 +8,7 @@
# CAMITK_SOURCE_DIR=~/Dev/CamiTK/src/camitk # path to CamiTK code source directory
# CAMITK_BUILD_DIR=~/Dev/CamiTK/build/camitk-exp # path to the intended build directory
# CAMITK_BUILD_SETTINGS="GCC-64bits-Debug" # compiler-arch-buildtype string
# RERUN_TESTNAME=..." # name of the test
#
# 2. run the command
# ctest -VV \
......@@ -18,7 +19,8 @@
# -DCI_BUILD_SETTINGS="$COMPILER_CONFIG" \
# -DCTEST_SOURCE_DIRECTORY="$CAMITK_SOURCE_DIR" \
# -DCTEST_BINARY_DIRECTORY="$CAMITK_BUILD_DIR" \
# -S $CAMITK_SOURCE_DIR/sdk/cmake/ctest/ci-test.cmake > test.log 2>&1
# -DRERUN_TESTNAME=name-of-the-test-to-run \
# -S $CAMITK_SOURCE_DIR/sdk/cmake/ctest/ci-rerun.cmake > test.log 2>&1
#
# It will submit a new report in the "configure" section of the dashboard
# identified as $SITE and $COMPILER_CONFIG.
......@@ -36,17 +38,11 @@ set(CI_STAGE "Test")
include("${CTEST_SOURCE_DIRECTORY}/sdk/cmake/ctest/ci-setup.cmake")
# ------------------------ STEP 2: test ------------------------
message(STATUS "Step 2. Rerun only test '${RERUN_TESTNAME}'... Using ${NUMBER_OF_PROC} tests in parallel")
message(STATUS "Step 2. Rerun only test ${RERUN_TESTNAME}... Using ${NUMBER_OF_PROC} tests in parallel")
# set extra time for test to 30 min = 1800 s (default is 10 min = 600 s)
set(CTEST_TEST_TIMEOUT 1800)
# Update CDash configuration to the server
# The Project.xml file is automatically generated at configure time.
# If a new extension is added to CamiTK, CDash will automatically be updated according to it.
# To do this, send this file to the server
ctest_submit(FILES "${CTEST_BINARY_DIRECTORY}/Project.xml")
# run test
message(STATUS "- Running test ${RERUN_TESTNAME}...")
......
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