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

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 4719bd9bbb..0aa24252e4 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -7,35 +7,59 @@ tests_nb=0
 rm -f test.failed test.success test.ignored
 
 if [ xvalgrind = "x$1" ] ; then
-  valgrind=valgrind
+  valgrind="libtool --mode=execute valgrind --show-reachable=yes"
 else
   valgrind=
 fi
-#	    config_usage                        \
-for test in log_usage                           \
-            dynar_int dynar_double dynar_string \
- 	    dict_usage dict_crash               \
+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@ \
 	    \
-	    datadesc_usage                      \
-	    "datadesc_usage --read datadesc.little32" \
-	    "datadesc_usage --read datadesc.little64" \
-	    "datadesc_usage --read datadesc.big32"  \
-	    "datadesc_usage --read datadesc.big64" 
+	    gras/trp_tcp_usage@EXEEXT@      gras/trp_file_usage@EXEEXT@             \
+	    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" \
+	    \
+	    surf/maxmin_usage@EXEEXT@       surf/maxmin_bench@EXEEXT@               \
+	    surf/trace_usage@EXEEXT@                                        \
+	    surf/surf_usage@EXEEXT@                                         
 do		    
   tests_nb=`expr $tests_nb + 1`
   echo "#### Test $test"
+  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" ] ; then
-    ./$test --gras-log="root.thres=info" 2>&1
+    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
+    # if the user defines walgrind while cross-compiling, too bad
+    $wine $valgrind ./$cmd --gras-log="root.thres=info" 2>&1
+    retval=$?
+    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
+      cd $dir
+      $wine ./$cmd --gras-log="root.thres=debug" 2>&1
+      cd ..
     else 
-      $valgrind ./$test --gras-log="root.thres=debug" 2>&1
+      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