From 461bbfb9083ba335d612ee8161fa0ec93f9ea20e Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 31 Dec 2004 10:45:10 +0000 Subject: [PATCH] remove complications to run tests from there own directory now that the path isn't hardcoded anymore in surf/msg git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@706 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- testsuite/run_tests.in | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in index 52174fcf04..aab584e482 100755 --- a/testsuite/run_tests.in +++ b/testsuite/run_tests.in @@ -34,43 +34,33 @@ for test in xbt/log_usage@EXEEXT@ \ 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 -- 2.20.1