dont configure/build twice for dynamicanalysis

[simgrid.git] / tools / jenkins / DynamicAnalysis.sh

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index 0e50a6e..610555a 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -52,16 +52,14 @@ done
 cd $WORKSPACE/build
 
 ### Proceed with the tests
+ctest -D ExperimentalStart || true
 
 cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
       -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
       -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=OFF \
       -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \
       -Denable_memcheck_xml=ON $WORKSPACE
-make
 
-ctest -D ExperimentalStart || true
-ctest -D ExperimentalConfigure || true
 ctest -D ExperimentalBuild || true
 ctest -D ExperimentalMemCheck || true
 
@@ -72,24 +70,20 @@ if [ -f Testing/TAG ] ; then
 fi
 
 make clean
+ctest -D ExperimentalStart || true
 
-cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
+cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON -Denable_tracing=ON \
       -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-      -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=OFF \
-      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF  \
-      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_coverage=ON $WORKSPACE
+      -Denable_latency_bound_tracking=ON -Denable_jedule=ON -Denable_mallocators=ON \
+      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \
+      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE
 
-make
-ctest -D ExperimentalStart || true
-ctest -D ExperimentalConfigure || true
 ctest -D ExperimentalBuild || true
 ctest -D ExperimentalTest || true
 ctest -D ExperimentalCoverage || true
 
 if [ -f Testing/TAG ] ; then
-   /usr/local/gcovr-3.1/scripts/gcovr -r .. --xml-pretty -o $WORKSPACE/xml_coverage.xml
+   /usr/local/gcovr-3.1/scripts/gcovr -r .. --xml-pretty -e teshsuite.* -u -o $WORKSPACE/xml_coverage.xml
    xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
    mv CTestResults_memcheck.xml $WORKSPACE
 fi
-
-do_cleanup