From: Augustin Degomme <adegomme@gmail.com>
Date: Tue, 28 Jan 2020 10:14:25 +0000 (+0100)
Subject: keep quiet for valgrind tests on ci to avoid false positives with tesh
X-Git-Tag: v3.25~58
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/37afad3d49fac7cc44686a511bcda2ceb26a0d4c

keep quiet for valgrind tests on ci to avoid false positives with tesh
---

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 3a79f5a075..da48f7c766 100755
--- 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 107ffd45b9..fadf32cdc5 100755
--- 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";