X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09c8124a61c40287d7f4e0690eb723808491ebc1..305fbc7b720f845588b22de910245576971a5f97:/teshsuite/Makefile.am

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 5ef60e1db3..d9826285e6 100644
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -65,7 +65,6 @@ TESTS += \
 XFAIL_TESTS+= \
   gras/datadesc/datadesc_r_little32.tesh   \
   gras/datadesc/datadesc_r_big32_8.tesh    \
-  gras/datadesc/datadesc_r_big32_8_4.tesh  \
   gras/datadesc/datadesc_r_big32_2.tesh
 
 noinst_PROGRAMS += gras/datadesc/datadesc_usage   
@@ -77,7 +76,9 @@ gras/datadesc/datadesc_structs.c: gras/datadesc/mk_datadesc_structs.pl
 
   ## Ensures the gras_msg_handle semantic ##
   ##########################################
-EXTRA_DIST += gras/msg_handle/msg_handle.xml
+EXTRA_DIST += gras/msg_handle/msg_handle.xml \
+              gras/msg_handle/test_rl \
+	      gras/msg_handle/test_sg_32 gras/msg_handle/test_sg_64
 noinst_PROGRAMS+=\
   gras/msg_handle/msg_handle_client \
   gras/msg_handle/msg_handle_server \
@@ -94,7 +95,7 @@ gras_msg_handle_msg_handle_server_LDADD=      $(LDADD_RL)
 gras/msg_handle/_msg_handle_simulator.c gras/msg_handle/_msg_handle_client.c gras/msg_handle/_msg_handle_server.c : gras/msg_handle/msg_handle.c gras/msg_handle/msg_handle.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
 	mkdir -p gras/msg_handle; \
 	  cd gras/msg_handle;\
-	  ../../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ msg_handle ../../$(top_srcdir)/teshsuite/gras/msg_handle/msg_handle.xml
+	  $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ msg_handle $(abs_top_srcdir)/teshsuite/gras/msg_handle/msg_handle.xml
 
 
 if GRAS_ARCH_32_BITS
@@ -105,11 +106,12 @@ endif
 
   ## Make sure it's ok to have empty main functions ##
   ####################################################
-EXTRA_DIST += gras/empty_main/empty_main.xml
+EXTRA_DIST += gras/empty_main/empty_main.xml \
+              gras/empty_main/test_rl gras/empty_main/test_sg
 noinst_PROGRAMS+=\
   gras/empty_main/empty_main_function \
   gras/empty_main/empty_main_simulator
-  
+
 gras_empty_main_empty_main_simulator_SOURCES= gras/empty_main/empty_main.c gras/empty_main/_empty_main_simulator.c
 gras_empty_main_empty_main_function_SOURCES=  gras/empty_main/empty_main.c gras/empty_main/_empty_main_function.c
 
@@ -119,17 +121,18 @@ gras_empty_main_empty_main_function_LDADD=    $(LDADD_RL)
 gras/empty_main/_empty_main_simulator.c gras/empty_main/_empty_main_function.c : gras/empty_main/empty_main.c gras/empty_main/empty_main.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
 	mkdir -p gras/empty_main; \
 	  cd gras/empty_main;\
-	  ../../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ empty_main ../../$(top_srcdir)/teshsuite/gras/empty_main/empty_main.xml
+	  $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ empty_main $(abs_top_srcdir)/teshsuite/gras/empty_main/empty_main.xml
 
 TESTS += gras/empty_main/test_rl gras/empty_main/test_sg
 
-  ## Make sure it's ok to have very small sleeps ##
-  #################################################
-EXTRA_DIST += gras/small_sleep/small_sleep.xml
+  ## Make sure it's ok to have very small sleeps (not meant for real life) ##
+  ###########################################################################
+EXTRA_DIST += gras/small_sleep/small_sleep.xml \
+              gras/small_sleep/test_sg_32 gras/small_sleep/test_sg_64
 noinst_PROGRAMS+=\
   gras/small_sleep/small_sleep_function \
   gras/small_sleep/small_sleep_simulator
-  
+
 gras_small_sleep_small_sleep_simulator_SOURCES= gras/small_sleep/small_sleep.c gras/small_sleep/_small_sleep_simulator.c
 gras_small_sleep_small_sleep_function_SOURCES=  gras/small_sleep/small_sleep.c gras/small_sleep/_small_sleep_function.c
 
@@ -139,10 +142,24 @@ gras_small_sleep_small_sleep_function_LDADD=    $(LDADD_RL)
 gras/small_sleep/_small_sleep_simulator.c gras/small_sleep/_small_sleep_function.c : gras/small_sleep/small_sleep.c gras/small_sleep/small_sleep.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
 	mkdir -p gras/small_sleep; \
 	  cd gras/small_sleep;\
-	  ../../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ small_sleep ../../$(top_srcdir)/teshsuite/gras/small_sleep/small_sleep.xml
+	  $(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ small_sleep $(abs_top_srcdir)/teshsuite/gras/small_sleep/small_sleep.xml
 
-TESTS += gras/small_sleep/test_sg
-# gras/small_sleep/test_rl don't test on RL!!
+if GRAS_ARCH_32_BITS
+  TESTS += gras/small_sleep/test_sg_32
+else
+  TESTS += gras/small_sleep/test_sg_64
+endif
+
+#############
+# MSG tests #
+#############
+
+noinst_PROGRAMS += msg/get_sender
+EXTRA_DIST      += msg/get_sender.xml \
+		   msg/get_sender.tesh
+msg_get_sender_SOURCES = msg/get_sender.c
+msg_get_sender_LDADD   = $(LDADD_SG)
+TESTS += msg/get_sender.tesh
 
 ###################################
 # network model test via SimDag API
@@ -157,6 +174,47 @@ simdag_network_test_reinit_costs_LDADD   =   $(LDADD_SG)
 TESTS += \
   simdag/network/test_reinit_costs.tesh
 
+noinst_PROGRAMS += simdag/platforms/basic_parsing_test
+simdag_platforms_basic_parsing_test_SOURCES = simdag/platforms/basic_parsing_test.c
+simdag_platforms_basic_parsing_test_LDADD = $(LDADD_SG)
+TESTS += simdag/platforms/basic_parsing_test.tesh
+XFAIL_TESTS += simdag/platforms/basic_parsing_test_failing.tesh
+
+noinst_PROGRAMS += simdag/platforms/flatifier
+simdag_platforms_flatifier_SOURCES = simdag/platforms/flatifier.c
+simdag_platforms_flatifier_LDADD = $(LDADD_SG)
+TESTS += simdag/platforms/flatifier.tesh
+
+EXTRA_DIST      += simdag/platforms/one_cluster_foreach.xml \
+                   simdag/platforms/one_cluster_one_host_random.xml \
+                   simdag/platforms/one_cluster_one_host.xml \
+                   simdag/platforms/one_cluster_properties_foreach.xml \
+                   simdag/platforms/one_cluster_properties_override.xml \
+                   simdag/platforms/one_cluster.xml \
+                   simdag/platforms/one_host_availability.xml \
+                   simdag/platforms/one_host_properties.xml \
+                   simdag/platforms/one_host_state_file.xml \
+                   simdag/platforms/one_host_state_off.xml \
+                   simdag/platforms/one_host_state_on.xml \
+                   simdag/platforms/one_host_trace_file.xml \
+                   simdag/platforms/one_host_trace_inside.xml \
+                   simdag/platforms/one_host.xml \
+                   simdag/platforms/one_link_availability.xml \
+                   simdag/platforms/one_link_fatpipe.xml \
+                   simdag/platforms/one_link_shared.xml \
+                   simdag/platforms/one_link_state_file.xml \
+                   simdag/platforms/route_override.xml \
+                   simdag/platforms/three_hosts_non_symmetric_route.xml \
+                   simdag/platforms/two_clusters_symmetric.xml \
+                   simdag/platforms/two_clusters.xml \
+                   simdag/platforms/two_hosts_multi_hop.xml \
+                   simdag/platforms/two_hosts_one_link.xml \
+		   simdag/platforms/bob.fail \
+		   simdag/platforms/bob.trace \
+		   simdag/platforms/link1.bw \
+		   simdag/platforms/link1.fail \
+		   simdag/platforms/link1.lat 
+
 # from L.C. Canon
 noinst_PROGRAMS += simdag/basic0 \
                    simdag/basic1 \