From: Claire Mouton <claire.mouton@creatis.insa-lyon.fr> Date: Tue, 8 Apr 2014 14:41:33 +0000 (+0200) Subject: Modified CDash scripts to launch a clean compilation each night. X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ecda42e32a95b5e6720e12353a80ed9e8d0e2098;p=creaToolsTools.git Modified CDash scripts to launch a clean compilation each night. --- diff --git a/Linux/scripts/cdashmod.sh b/Linux/scripts/cdashmod.sh index da61e4f..48da3b8 100755 --- a/Linux/scripts/cdashmod.sh +++ b/Linux/scripts/cdashmod.sh @@ -47,10 +47,11 @@ git pull origin master # configures the compilation to enable testing with CDash cd $2/creatools_bin/$3Bin pwd -cmake -DBUILD_TESTING:BOOL=ON -DINCLUDE_CTEST:BOOL=ON -DCREA_BUILD_VTK:BOOL=ON -DCREA_BUILD_WX:BOOL=ON -DBOOST_SIGNALS_NO_DEPRECATION_WARNING:BOOL=ON $2/creatools_source/$3 +cmake -DBUILD_TESTING:BOOL=ON -DINCLUDE_CTEST:BOOL=ON -DCREA_BUILD_VTK:BOOL=ON -DCREA_BUILD_WX:BOOL=ON $2/creatools_source/$3 cmake . cmake . -# launches the compilation and sends the result to the dashboard +# cleans and launches the compilation an and sends the result to the dashboard +make clean make -j$4 Experimental diff --git a/Linux/scripts/compilation_from_installscript.sh b/Linux/scripts/compilation_from_installscript.sh index b9998ea..d023a62 100644 --- a/Linux/scripts/compilation_from_installscript.sh +++ b/Linux/scripts/compilation_from_installscript.sh @@ -16,6 +16,6 @@ cd creaToolsTools_crontabAnonymousAccess/Linux # Retrieves creatools source code, compiles and install ./installscript creatools -# to launch make experimental : this line is a perfect crontab if we do not want to do update of the git repositories +# to launch make experimental after a make clean : this line is a perfect crontab if we do not want to do update of the git repositories bash /home/creatools/Creatis/creaToolsTools_crontabAnonymousAccess/Linux/scripts/cdashscript.sh /home/creatools/Creatis/creaToolsTools_crontabAnonymousAccess/Linux/scripts/cdashmod.sh /home/creatools/Creatis/creaToolsTools_crontabAnonymousAccess/ /home/creatools/Creatis/CreatoolsGenerationDir_crontabAnonymousAccess 4 diff --git a/Linux/scripts/crontab b/Linux/scripts/crontab index 8d91cba..770941d 100644 --- a/Linux/scripts/crontab +++ b/Linux/scripts/crontab @@ -28,6 +28,6 @@ SHELL=/bin/bash MAILTO=cdash-admin@creatis.insa-lyon.fr # runs the tests at midnight -0 0 * * * bash <CREATOOLS_PATH>/creaToolsTools/Linux/scripts/cdashscript.sh /home/creatools/Creatis/creaToolsTools/Linux/scripts/cdashmod.sh /home/creatools/Creatis/creaToolsTools/ /home/creatools/Creatis/CreatoolsGenerationDir 4 +# 0 0 * * * bash <CREATOOLS_PATH>/creaToolsTools/Linux/scripts/cdashscript.sh /home/creatools/Creatis/creaToolsTools/Linux/scripts/cdashmod.sh /home/creatools/Creatis/creaToolsTools/ /home/creatools/Creatis/CreatoolsGenerationDir 4 0 0 * * * bash <CREATOOLS_PATH>/creaToolsTools/Linux/scripts/compilation_from_installscript.sh