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

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 0aa24252e4..52174fcf04 100755
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -17,17 +17,20 @@ 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/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.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@                                         
+	    "surf/surf_usage@EXEEXT@  @top_srcdir@/testsuite/surf/platform.txt" \
+	    "surf/surf_usage2@EXEEXT@ @top_srcdir@/testsuite/surf/platform.txt"
 do		    
   tests_nb=`expr $tests_nb + 1`
   echo "#### Test $test"
@@ -38,29 +41,37 @@ do
   else
     wine=wine
   fi
-  if [ "x$test" = "xdict_crash" ] ; then
+  if [ "x$test" = "xdict_crash@EXEEXT@" ] ; then
     cd $dir
     $wine ./$cmd --gras-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=$?
+    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
   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
+#      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