diff --git a/trunk/installParadiseo.sh b/trunk/installParadiseo.sh index 08c96bc2f..bf93f9cad 100755 --- a/trunk/installParadiseo.sh +++ b/trunk/installParadiseo.sh @@ -33,9 +33,15 @@ DEFAULT_BUILD_TYPE=Release BUILD_TYPE=$DEFAULT_BUILD_TYPE # CMake/CTest/Dart flags -CTEST_DEFAULT_CONFIG="-D ExperimentalStart -D ExperimentalBuild" +CTEST_DEFAULT_CONFIG="-D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest" CTEST_CONFIG=$CTEST_DEFAULT_CONFIG +# What are the tests that should be always run ? +EO_MIN_UNIT_TEST=t-eoEasyEA +MO_MIN_UNIT_TEST=t-moHC +MOEO_MIN_UNIT_TEST=t-moeoEasyEA +PEO_MIN_UNIT_TEST=t-Mpdboot t-ParallelEval + # install types to select in the main menu P_FULL_INSTALL=1 P_BASIC_INSTALL=2 @@ -410,7 +416,7 @@ function run_install_step() if [ "$COMPILE_PARADISEO" = "1" ] then - execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-4] Compile ParadisEO-EO using CTest" $SPY + execute_cmd "ctest $CTEST_CONFIG -R $EO_MIN_UNIT_TEST" "[$currentStepCounter-4] Compile ParadisEO-EO using CTest" $SPY LAST_RETURN=$? # don't consider a submission error as a "right error" if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ] @@ -452,7 +458,7 @@ function run_install_step() if [ "$COMPILE_PARADISEO" = "1" ] then - execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-3] Compile ParadisEO-MO using CTest" $SPY + execute_cmd "ctest $CTEST_CONFIG -R $MO_MIN_UNIT_TEST" "[$currentStepCounter-3] Compile ParadisEO-MO using CTest" $SPY LAST_RETURN=$? # don't consider a submission error as a "right error" if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ] @@ -493,7 +499,7 @@ function run_install_step() if [ "$COMPILE_PARADISEO" = "1" ] then - execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-3] Compile ParadisEO-MOEO using CTest" $SPY + execute_cmd "ctest $CTEST_CONFIG -R $MOEO_MIN_UNIT_TEST" "[$currentStepCounter-3] Compile ParadisEO-MOEO using CTest" $SPY LAST_RETURN=$? # don't consider a submission error as a "right error" if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ] @@ -793,7 +799,7 @@ function run_install_step() if [ "$COMPILE_PARADISEO" = "1" ] then - execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-3] Compile ParadisEO-PEO using CTest" $SPY + execute_cmd "ctest $CTEST_CONFIG -R $PEO_MIN_UNIT_TEST" "[$currentStepCounter-3] Compile ParadisEO-PEO using CTest" $SPY LAST_RETURN=$? # don't consider a submission error as a "right error" if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ]