X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66eeb4028730b704a90c79edc202e18a159b3eda..c4e3a3e34e94ed337b089eb6339bf9b6fd5b9657:/testsuite/run_tests.in

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 8795b91465..8588a811ec 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -7,38 +7,70 @@ tests_nb=0
 rm -f test.failed test.success test.ignored
 
 if [ xvalgrind = "x$1" ] ; then
-  valgrind="libtool --mode=execute valgrind"
+  valgrind="libtool --mode=execute valgrind --show-reachable=yes"
 else
   valgrind=
 fi
-for test in xbt/log_usage                                          \
-            xbt/dynar_int xbt/dynar_double xbt/dynar_string      \
- 	    xbt/dict_usage xbt/dict_crash                         \
-	    xbt/config_usage                                       \
+for test in xbt/log_usage@EXEEXT@                                 \
+            xbt/dynar_int@EXEEXT@ xbt/dynar_double@EXEEXT@ xbt/dynar_string@EXEEXT@       \
+ 	    xbt/dict_usage@EXEEXT@ xbt/dict_crash@EXEEXT@                         \
+	    xbt/config_usage@EXEEXT@                                      \
+	    xbt/heap_bench@EXEEXT@ \
 	    \
 	    gras/trp_tcp_usage      gras/trp_file_usage             \
-	    gras/datadesc_usage                                     \
-	    "gras/datadesc_usage --read @srcdir@/gras/datadesc.little32" \
-	    "gras/datadesc_usage --read @srcdir@/gras/datadesc.little64" \
-	    "gras/datadesc_usage --read @srcdir@/gras/datadesc.big32"    \
-	    "gras/datadesc_usage --read @srcdir@/gras/datadesc.big64"    \
-	    "gras/datadesc_usage --read @srcdir@/gras/datadesc.aix"
+	    gras/datadesc_usage@EXEEXT@                                     \
+	    "gras/datadesc_usage@EXEEXT@ --read @top_srcdir@/../testsuite/gras/datadesc.little32" \
+	    "gras/datadesc_usage@EXEEXT@ --read @top_srcdir@/../testsuite/gras/datadesc.little64" \
+	    "gras/datadesc_usage@EXEEXT@ --read @top_srcdir@/../testsuite/gras/datadesc.big32"    \
+	    "gras/datadesc_usage@EXEEXT@ --read @top_srcdir@/../testsuite/gras/datadesc.big64"    \
+	    "gras/datadesc_usage@EXEEXT@ --read @top_srcdir@/../testsuite/gras/datadesc.aix" \
+	    "gras/datadesc_usage@EXEEXT@ --read @top_srcdir@/../testsuite/gras/datadesc.win32" \
+	    "gras/datadesc_usage@EXEEXT@ --read @top_srcdir@/../testsuite/gras/datadesc.g5" \
+	    \
+	    surf/maxmin_usage@EXEEXT@       surf/maxmin_bench@EXEEXT@               \
+	    surf/trace_usage@EXEEXT@                                        \
+	    "surf/surf_usage@EXEEXT@ platform.txt" "surf/surf_usage2@EXEEXT@ platform.txt"                                        
 do		    
   tests_nb=`expr $tests_nb + 1`
   echo "#### Test $test"
-  if [ "x$test" = "xdict_crash" ] ; then
-    ./$test --gras-log="root.thres=info" 2>&1
+  dir=`echo $test |sed 's|\([^/]*\)/\(.*\)|\1|'`
+  cmd=`echo $test |sed 's|\([^/]*\)/\(.*\)|\2|'`
+  if [ x@EXEEXT@ = x ] ; then 
+    wine=
+  else
+    wine=wine
+  fi
+  if [ "x$test" = "xdict_crash@EXEEXT@" ] ; then
+    cd $dir
+    $wine ./$cmd --gras-log="root.thres=info" 2>&1
+    retval=$?
+    cd ..
   else 
-    $valgrind ./$test --gras-log="root.thres=info" 2>&1
+    cd $dir
+    winesave=$wine
+    if [ x@EXEEXT@ != x ] ; then 
+      if echo ${cmd} | grep @EXEEXT@ >/dev/null ; then : ; else
+        echo "This is not a win32 binary, don't use wine"
+        wine=""
+      fi
+    fi
+      # if the user defines valgrind while cross-compiling, too bad
+      $wine $valgrind ./$cmd --gras-log="root.thres=info" 2>&1
+      retval=$?
+    wine=$winesave
+    cd ..
   fi
-  retval=$?
   if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
     echo "## failed. Rerun $test with full details."
-    if [ "x$test" = "xdict_crash" ] ; then
-      ./$test --gras-log="root.thres=debug" 2>&1
-    else 
-      $valgrind ./$test --gras-log="root.thres=debug" 2>&1
-    fi
+#    if [ "x$test" = "xdict_crash" ] ; then
+#      cd $dir
+#      $wine ./$cmd --gras-log="root.thres=debug" 2>&1
+#      cd ..
+#    else 
+#      cd $dir
+#      $wine $valgrind ./$cmd --gras-log="root.thres=debug" 2>&1
+#      cd ..
+#    fi
     failed_nb=`expr $failed_nb + 1`
     echo "  $test (returned $retval)" >> test.failed
   else # retval == 77