Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI

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

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index b0f3b59..0e50a6e 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -54,7 +54,7 @@ cd $WORKSPACE/build
 ### Proceed with the tests
 
 cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF \
+      -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
@@ -74,7 +74,7 @@ fi
 make clean
 
 cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF \
+      -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
@@ -88,7 +88,7 @@ ctest -D ExperimentalCoverage || true
 
 if [ -f Testing/TAG ] ; then
    /usr/local/gcovr-3.1/scripts/gcovr -r .. --xml-pretty -o $WORKSPACE/xml_coverage.xml
-   xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
+   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_memcheck.xml
    mv CTestResults_memcheck.xml $WORKSPACE
 fi