Do not try to run gras yet.

[simgrid.git] / testsuite / run_tests.in

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 1731890..ae63dcf 100755 (executable)
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -11,35 +11,60 @@ if [ xvalgrind = "x$1" ] ; then
 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                                      \
-           xbt/heap_bench \
+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"
+           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@/testsuite/msg/ platform.xml"
+
+#          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 --gras-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 --gras-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 --gras-log="root.thres=debug" 2>&1
+#    else 
+#      $wine $valgrind ./$test --gras-log="root.thres=debug" 2>&1
+#    fi
     failed_nb=`expr $failed_nb + 1`
     echo "  $test (returned $retval)" >> test.failed
   else # retval == 77