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

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 4719bd9bbb..64771fa0d7 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -7,36 +7,64 @@ 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" 
+	    surf/maxmin_usage@EXEEXT@       surf/maxmin_bench@EXEEXT@               \
+	    "surf/trace_usage@EXEEXT@ --surf-path=@top_srcdir@/testsuite/surf/"              \
+	    "surf/surf_usage@EXEEXT@  --surf-path=@top_srcdir@/testsuite/surf/ platform.xml" \
+	    "surf/surf_usage2@EXEEXT@ --surf-path=@top_srcdir@/testsuite/surf/ platform.xml" \
+	    \
+	    "msg/msg_test@EXEEXT@ --surf-path=@top_srcdir@/examples/msg/"
+
+#	    gras/trp_tcp_usage      gras/trp_file_usage
+#	    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"
+
 do		    
   tests_nb=`expr $tests_nb + 1`
   echo "#### Test $test"
-  if [ "x$test" = "xdict_crash" ] ; then
-    ./$test --gras-log="root.thres=info" 2>&1
+  if [ x@EXEEXT@ = x ] ; then 
+    wine=
+  else
+    wine=wine
+  fi
+  if [ "x$test" = "xdict_crash@EXEEXT@" ] ; then
+    $wine ./$test --xbt-log="root.thres=info" 2>&1
+    retval=$?
   else 
-    $valgrind ./$test --gras-log="root.thres=info" 2>&1
+    winesave=$wine
+    if [ x@EXEEXT@ != x ] ; then 
+      if echo ${test} | 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 ./$test --xbt-log="root.thres=info" 2>&1
+      retval=$?
+    wine=$winesave
   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
+#      $wine ./$test --xbt-log="root.thres=debug" 2>&1
+#    else 
+#      $wine $valgrind ./$test --xbt-log="root.thres=debug" 2>&1
+#    fi
     failed_nb=`expr $failed_nb + 1`
     echo "  $test (returned $retval)" >> test.failed
   else # retval == 77
@@ -64,9 +92,9 @@ fi
 if [ $failed_nb != 0 ] ; then
   echo "$failed_nb tests of $tests_nb failed: "
   cat test.failed
-  echo "Rerun the tests using the following command: script -c 'make test' gras.tests.log"
-  echo " and send the following informations to martin.quinson@ens-lyon.fr:"
-  echo "   - the file gras.tests.log produced by this command."
+  echo "Rerun the tests using the following command: script -c 'make test' simgrid.tests.log"
+  echo " and send the following informations to simgrid2-users@listes.ens-lyon.fr:"
+  echo "   - the file simgrid.tests.log produced by this command."
   echo "   - a short description of the target platform (arch, OS, distrib, compiler)."
   echo "   - the config.log produced by the compilation."
 fi