Integrate simdag tests into the testing infrastructure

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2889 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index f695969..d910889 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -75,4 +75,6 @@ gras_datadesc_usage_LDADD=     $(LDADD_RL)
 gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
        cd gras ; perl ../$(top_srcdir)/testsuite/gras/mk_datadesc_structs.pl > datadesc_structs.c
 
+simdag_sd_test_LDADD=       $(LDADD_SG)
+
 include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 81f1cea..3422b67 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;"     
 
+simdag_TESTS="simdag/sd_test @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;   \
@@ -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=""
 
-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

diff --git a/testsuite/simdag/small_platform_variable.xml b/testsuite/simdag/small_platform_variable.xml
index db21d4c..42e3b3f 100644 (file)
--- a/testsuite/simdag/small_platform_variable.xml
+++ b/testsuite/simdag/small_platform_variable.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
 <platform_description version="1">
   <!-- ljlkj -->
-  <cpu name="Tremblay" power="98095000" availability_file="availability_tremblay.txt"/>
+  <cpu name="Tremblay" power="98095000" availability_file="simdag/availability_tremblay.txt"/>
   <cpu name="Jupiter" power="76296000"/>
   <cpu name="Fafard" power="76296000"/>
   <cpu name="Ginette" power="48492000"/>