From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sun, 7 Aug 2005 19:50:10 +0000 (+0000)
Subject: Fix previous commit: don't forget about valgrind when running the test following... 
X-Git-Tag: v3.3~3728
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1e57efceb36d0da2a73ed5e30123c154dc1a7022

Fix previous commit: don't forget about valgrind when running the test following dict_crash (for which valgrind is disabled)


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1628 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index bb94ef6755..313e2a83eb 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -86,6 +86,7 @@ do
       # overwrites "valgrind" as a value, but should be exclusive.
       exenv=wine  
     fi
+    exenvsave=$exenv	
     if [ "x$test" = "xxbt/dict_crash@EXEEXT@" ] ; then 
       if echo $exenv | grep valgrind >/dev/null ; then
  	exenv=
@@ -93,7 +94,6 @@ do
       $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=""
@@ -101,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