From 13e089e30e4728bfab06a32445ecd9a7e23350ef Mon Sep 17 00:00:00 2001
From: legrand <legrand@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 18 Mar 2008 12:49:08 +0000
Subject: [PATCH] added "-DENABLE_MINIMAL_CMAKE_TESTING=TRUE" by default and
 removed default setting ENABLE_CMAKE_TESTING=TRUE

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1166 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/install.cmake       |  8 +++-----
 trunk/installParadiseo.sh | 25 ++++++++++---------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/trunk/install.cmake b/trunk/install.cmake
index d7e4ad054..03ae4bb9b 100644
--- a/trunk/install.cmake
+++ b/trunk/install.cmake
@@ -93,11 +93,9 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES Debug)
 
 #SET(ENABLE_CMAKE_TESTING TRUE CACHE BOOL "Enable testing ?")
 
-IF (ENABLE_CMAKE_TESTING)  
-        ENABLE_TESTING()     
-        SET(BUILDNAME "${CMAKE_PROJECT_NAME}-${CMAKE_SYSTEM}-${CMAKE_CXX_COMPILER}" CACHE STRING "Name of the build on the dashboard" FORCE)
-        MARK_AS_ADVANCED(BUILDNAME)     
-ENDIF (ENABLE_CMAKE_TESTING)
+IF (ENABLE_CMAKE_TESTING OR ENABLE_MINIMAL_CMAKE_TESTING)  
+        ENABLE_TESTING()
+ENDIF (ENABLE_CMAKE_TESTING OR ENABLE_MINIMAL_CMAKE_TESTING)
 ######################################################################################
 
 
diff --git a/trunk/installParadiseo.sh b/trunk/installParadiseo.sh
index ebaf3fb09..3840457f8 100755
--- a/trunk/installParadiseo.sh
+++ b/trunk/installParadiseo.sh
@@ -37,10 +37,7 @@ CTEST_DEFAULT_CONFIG="-D ExperimentalStart -D ExperimentalBuild -D ExperimentalT
 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'
+MIN_CMAKE_FLAGS='-DENABLE_MINIMAL_CMAKE_TESTING=TRUE'
 
 # install types to select in the main menu
 P_FULL_INSTALL=1
@@ -409,9 +406,9 @@ function run_install_step()
 		execute_cmd "cd $installKitPath/paradiseo-eo/build" "[$currentStepCounter-2] Go in Paradiseo-EO build dir"  $SPY 
 		RETURN=`expr $RETURN + $?`
 		
-		execute_cmd " echo \"cmake ../  -G$BUILD_PROCESS_TYPE $OPTIONNAL_CMAKE_FLAGS\" " "[$currentStepCounter-3] Run CMake using generator $BUILD_PROCESS_TYPE"  $SPY
+		execute_cmd " echo \"cmake ../  -G$BUILD_PROCESS_TYPE $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS\" " "[$currentStepCounter-3] Run CMake using generator $BUILD_PROCESS_TYPE"  $SPY
 		
-		cmake ../  -G"$BUILD_PROCESS_TYPE"  -DCMAKE_BUILD_TYPE=$BUILD_TYPE $OPTIONNAL_CMAKE_FLAGS >> ${SPY} 2>> ${SPY}
+		cmake ../  -G"$BUILD_PROCESS_TYPE"  -DCMAKE_BUILD_TYPE=$BUILD_TYPE $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS >> ${SPY} 2>> ${SPY}
 		RETURN=`expr $RETURN + $?`
 
 		if [ "$COMPILE_PARADISEO" = "1" ] 
@@ -452,8 +449,8 @@ function run_install_step()
 		execute_cmd "cd $installKitPath/paradiseo-mo/build" "[$currentStepCounter-1] Go in Paradiseo-MO dir"  $SPY 
 		RETURN=$?
 		
-		execute_cmd " echo \"cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" $OPTIONNAL_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE\" " "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE"  $SPY
-		cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $OPTIONNAL_CMAKE_FLAGS>> ${SPY} 2>> ${SPY}
+		execute_cmd " echo \"cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE\" " "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE"  $SPY
+		cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS>> ${SPY} 2>> ${SPY}
 		RETURN=`expr $RETURN + $?`
 		
 		if [ "$COMPILE_PARADISEO" = "1" ] 
@@ -493,8 +490,8 @@ function run_install_step()
 		execute_cmd "cd $installKitPath/paradiseo-moeo/build" "[$currentStepCounter-1] Go in Paradiseo-MOEO dir"  $SPY 
 		RETURN=$?
 		
-		execute_cmd " echo \"cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $OPTIONNAL_CMAKE_FLAGS \"" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE"  $SPY
-		cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $OPTIONNAL_CMAKE_FLAGS >> ${SPY} 2>> ${SPY}
+		execute_cmd " echo \"cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS \"" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE"  $SPY
+		cmake ../ -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" -DCMAKE_BUILD_TYPE=$BUILD_TYPE $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS >> ${SPY} 2>> ${SPY}
 		RETURN=`expr $RETURN + $?`		
 		
 		if [ "$COMPILE_PARADISEO" = "1" ] 
@@ -793,8 +790,8 @@ function run_install_step()
 		execute_cmd "cd $installKitPath/paradiseo-peo/build" "[$currentStepCounter-1] Go in Paradiseo-PEO dir"  $SPY 
 		RETURN=$?
 
-		execute_cmd " echo \"cmake ../  -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" $OPTIONNAL_CMAKE_FLAGS \"" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE"  $SPY
-		cmake ../  -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" $OPTIONNAL_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE >> ${SPY} 2>> ${SPY}
+		execute_cmd " echo \"cmake ../  -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G\"$BUILD_PROCESS_TYPE\" $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS \"" "[$currentStepCounter-2] Run CMake using generator $BUILD_PROCESS_TYPE -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE"  $SPY
+		cmake ../  -Dconfig=$installKitPath/$CMAKE_PRIMARY_CONFIG_FILE -G"$BUILD_PROCESS_TYPE" $MIN_CMAKE_FLAGS $OPTIONNAL_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE >> ${SPY} 2>> ${SPY}
 		RETURN=`expr $RETURN + $?`
 		
 		if [ "$COMPILE_PARADISEO" = "1" ] 
@@ -1072,6 +1069,7 @@ do
   if [ "${i%=*}" = "--debug" ]
    then
       BUILD_TYPE=Debug
+      OPTIONNAL_CMAKE_FLAGS='-DENABLE_CMAKE_TESTING=TRUE'
       CTEST_CONFIG="$CTEST_CONFIG -D ExperimentalTest"
   fi
   if [ "${i%=*}" = "--skipdart" ]
@@ -1098,9 +1096,6 @@ then
   	  CTEST_CONFIG="$CTEST_CONFIG -D ExperimentalSubmit"
 fi
   
-### Set the optional flags for the modules
-OPTIONNAL_CMAKE_FLAGS='-DENABLE_CMAKE_TESTING=TRUE'
-
 ### Need the generator
 BUILD_PROCESS_TYPE=0
 GENERATOR_TREATENED=0