Merge branch 'master' into depencencies

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 3a79f5a..da48f7c 100755 (executable)
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -527,7 +527,7 @@ fi
 
 # Do not remove, this variable may be used by user code (e.g. StarPU)
 export SMPI_GLOBAL_SIZE=${NUMPROCS}
-if [ -n "${KEEP}" ] ; then
+if [ -n "${KEEP}" -a -z "${QUIET}" ] ; then
     echo ${EXEC} ${PRIVATIZE} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
     if [ ${HOSTFILETMP} = 1 ] ; then
         echo "Generated hostfile ${HOSTFILE} kept."

diff --git a/tools/cmake/scripts/my_valgrind.pl b/tools/cmake/scripts/my_valgrind.pl
index 107ffd4..fadf32c 100755 (executable)
--- a/tools/cmake/scripts/my_valgrind.pl
+++ b/tools/cmake/scripts/my_valgrind.pl
@@ -14,7 +14,7 @@ my $count = 0;
 while (defined(my $arg = shift)) {
 #    print "arg($count)$arg\n";
     if ($arg =~ m!/smpirun$!) {
-        @argv = ( $arg, "-keep-temps", "-wrapper", "@argv" );
+        @argv = ( $arg, "-keep-temps", "-quiet", "-wrapper", "@argv" );
     } elsif ($arg eq "--cd") {
         $arg = shift;
         print "cd $arg\n";

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index e28143c..b55d5c4 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -49,7 +49,7 @@ cd $WORKSPACE/build
 ### Proceed with the tests
 ctest -D ExperimentalStart || true
 
-cmake -Denable_documentation=OFF -Denable_lua=OFF  \
+cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_python=OFF \
       -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
       -Denable_jedule=OFF -Denable_mallocators=OFF \
       -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \