X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9189fe94c14ef9e31142d1603a1979ea7e731a0a..253adc083aed58ee34200da9e8dac111926a7092:/testsuite/run_tests.in

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index eadbb9d67b..27fcd51335 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -10,8 +10,13 @@ tests_nb=0
 
 rm -f test.failed test.success test.ignored
 
-# Work around a libtool issue on solaris
-export LD_LIBRARY_PATH=@top_srcdir@/src/.libs
+# Work around a libtool issue on solaris, making sure that it works even on sh older than tcsh
+LD_LIBRARY_PATH=@top_srcdir@/src/.libs
+if export LD_LIBRARY_PATH ; then 
+  :
+else
+  setenv LD_LIBRARY_PATH @top_srcdir@/src/.libs
+fi
 
 ##
 ## Args parsing (simplistic for now)
@@ -86,11 +91,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 +106,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