A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shut doxygen up about unknown html tags
[simgrid.git]
/
testsuite
/
run_tests.in
diff --git
a/testsuite/run_tests.in
b/testsuite/run_tests.in
index
81f1cea
..
cb5209b
100755
(executable)
--- a/
testsuite/run_tests.in
+++ b/
testsuite/run_tests.in
@@
-52,6
+52,10
@@
gras_TESTS="gras/trp_tcp_usage; gras/trp_file_usage;
gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_8_4; \
gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_2;"
gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_8_4; \
gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_2;"
+simdag_TESTS="simdag/sd_test --surf-path=@srcdir@/simdag @srcdir@/simdag/small_platform_variable.xml; \
+ simdag/sd_test @top_srcdir@/examples/msg/small_platform.xml; \
+ simdag/sd_test @top_srcdir@/examples/msg/msg_platform.xml; "
+
# Data sets still to regenerate:
#
# gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_4; \
# Data sets still to regenerate:
#
# gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32_4; \
@@
-64,7
+68,7
@@
gras_TESTS="gras/trp_tcp_usage; gras/trp_file_usage;
# we split tests on ';' so that they can contain spaces (test=accumulator)
test=""
# we split tests on ';' so that they can contain spaces (test=accumulator)
test=""
-for testpart in $xbt_TESTS $gras_TESTS $surf_TESTS
+for testpart in $xbt_TESTS $gras_TESTS $surf_TESTS
$simdag_TESTS
do
test="$test $testpart"
if echo $test | grep ';' >/dev/null ; then
do
test="$test $testpart"
if echo $test | grep ';' >/dev/null ; then
@@
-99,7
+103,7
@@
do
if echo $exenv | grep valgrind >/dev/null ; then
exenv=
fi
if echo $exenv | grep valgrind >/dev/null ; then
exenv=
fi
- $exenv ./$test --
xbt-
log="root.thres=info" 2>&1
+ $exenv ./$test --log="root.thres=info" 2>&1
retval=$?
else
if [ x@EXEEXT@ != x ] && [ x$exenv = xwine ] ; then
retval=$?
else
if [ x@EXEEXT@ != x ] && [ x$exenv = xwine ] ; then
@@
-107,16
+111,16
@@
do
exenv=""
fi
fi
exenv=""
fi
fi
- $exenv ./$test --
xbt-
log="root.thres=info" 2>&1
+ $exenv ./$test --log="root.thres=info" 2>&1
retval=$?
fi
exenv=$exenvsave
if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
echo "## failed" # . Rerun $test with full details."
# if [ "x$test" = "xdict_crash" ] ; then
retval=$?
fi
exenv=$exenvsave
if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
echo "## failed" # . Rerun $test with full details."
# if [ "x$test" = "xdict_crash" ] ; then
-# $exenv ./$test --
xbt-
log="root.thres=debug" 2>&1
+# $exenv ./$test --log="root.thres=debug" 2>&1
# else
# else
-# $exenv ./$test --
xbt-
log="root.thres=debug" 2>&1
+# $exenv ./$test --log="root.thres=debug" 2>&1
# fi
failed_nb=`expr $failed_nb + 1`
echo " $test (returned $retval)" >> test.failed
# fi
failed_nb=`expr $failed_nb + 1`
echo " $test (returned $retval)" >> test.failed