xbt_TESTS=" \
xbt/log_usage@EXEEXT@; \
xbt/context_usage@EXEEXT@; \
+ xbt/graphxml_usage@EXEEXT@ @srcdir@/xbt/graph.xml; \
xbt/heap_bench@EXEEXT@;"
-
-surf_TESTS="surf/maxmin_usage@EXEEXT@; \
+
+surf_TESTS="surf/lmm_usage@EXEEXT@; \
surf/maxmin_bench@EXEEXT@; \
surf/trace_usage@EXEEXT@ --surf-path=@srcdir@/surf/; \
surf/surf_usage@EXEEXT@ --surf-path=@srcdir@/surf/ platform.xml; \
gras_TESTS="gras/trp_tcp_usage; gras/trp_file_usage; \
gras/datadesc_usage@EXEEXT@; \
+ gras/datadesc_usage@EXEEXT@ --copy; \
gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little32; \
- gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little32_4;\
- gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little64; \
- gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32; \
- 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.little64;"
+
+# gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.little32_4;\
+# gras/datadesc_usage@EXEEXT@ --read @srcdir@/gras/datadesc.big32; \
+# 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:
#
# 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
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
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
-# $exenv ./$test --xbt-log="root.thres=debug" 2>&1
+# $exenv ./$test --log="root.thres=debug" 2>&1
# 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
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' simgrid.tests.log"
+ echo "Rerun the tests using the following command: script -c 'make check' simgrid.tests.log"
echo " and send the following informations to simgrid-devel@lists.gforge.inria.fr:"
echo " - the file simgrid.tests.log produced by this command."
echo " - a short description of the target platform (arch, OS, distrib, compiler)."