Yet another dataset regeneration (some machines need a loooong time to recompile SG)

[simgrid.git] / testsuite / run_tests.in

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index eadbb9d..313e2a8 100755 (executable)
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -86,11 +86,14 @@ do
       # overwrites "valgrind" as a value, but should be exclusive.
       exenv=wine  
     fi
-    if [ "x$test" = "xdict_crash@EXEEXT@" ] ; then
+    exenvsave=$exenv   
+    if [ "x$test" = "xxbt/dict_crash@EXEEXT@" ] ; then 
+      if echo $exenv | grep valgrind >/dev/null ; then
+       exenv=
+      fi
       $exenv ./$test --xbt-log="root.thres=info" 2>&1
       retval=$?
     else 
-      exenvsave=$exenv
       if [ x@EXEEXT@ != x ] && [ x$exenv = xwine ] ; then 
         if echo ${test} | grep @EXEEXT@ >/dev/null ; then : ; else
           exenv=""
@@ -98,8 +101,8 @@ do
       fi
       $exenv ./$test --xbt-log="root.thres=info" 2>&1
       retval=$?
-      exenv=$exenvsave
     fi
+    exenv=$exenvsave
     if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
       echo "## failed" # . Rerun $test with full details."
 #      if [ "x$test" = "xdict_crash" ] ; then