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

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 0aa24252e4..64771fa0d7 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -17,50 +17,54 @@ for test in xbt/log_usage@EXEEXT@                                 \
 	    xbt/config_usage@EXEEXT@                                      \
 	    xbt/heap_bench@EXEEXT@ \
 	    \
-	    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@                                         
+	    "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"
-  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
-    cd $dir
-    $wine ./$cmd --gras-log="root.thres=info" 2>&1
+  if [ "x$test" = "xdict_crash@EXEEXT@" ] ; then
+    $wine ./$test --xbt-log="root.thres=info" 2>&1
     retval=$?
-    cd ..
   else 
-    cd $dir
-    # if the user defines walgrind while cross-compiling, too bad
-    $wine $valgrind ./$cmd --gras-log="root.thres=info" 2>&1
-    retval=$?
-    cd ..
+    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
   if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
     echo "## failed. Rerun $test with full details."
-    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
+#    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
@@ -88,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