Take into account last API modification. Sorry about that.

[simgrid.git] / testsuite / run_tests.in

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index e7f83e8..aab584e 100755 (executable)
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -19,55 +19,48 @@ for test in xbt/log_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"
-  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@EXEEXT@" ] ; then
-    cd $dir
-    $wine ./$cmd --gras-log="root.thres=info" 2>&1
+    $wine ./$test --gras-log="root.thres=info" 2>&1
     retval=$?
-    cd ..
   else 
-    cd $dir
     winesave=$wine
     if [ x@EXEEXT@ != x ] ; then 
-      if echo ${cmd} | grep @EXEEXT@ >/dev/null ; then : ; else
+      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 ./$cmd --gras-log="root.thres=info" 2>&1
+      $wine $valgrind ./$test --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 ..
+#      $wine ./$test --gras-log="root.thres=debug" 2>&1
 #    else 
-#      cd $dir
-#      $wine $valgrind ./$cmd --gras-log="root.thres=debug" 2>&1
-#      cd ..
+#      $wine $valgrind ./$test --gras-log="root.thres=debug" 2>&1
 #    fi
     failed_nb=`expr $failed_nb + 1`
     echo "  $test (returned $retval)" >> test.failed