Move OSSP testsuite code out of the testsuite/ dir so that it becomes part of XBT

[simgrid.git] / testsuite / Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4f239aa..fb394bc 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -9,8 +9,7 @@ EXTRA_DIST=run_tests.in \
   gras/datadesc.little64\
   gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \
   gras/mk_datadesc_structs.pl \
-  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml \
-  msg/messages.h
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml
 
 # Data sets still to regenerate:
 # gras/datadesc.big64 
@@ -20,15 +19,15 @@ EXTRA_DIST=run_tests.in \
 # Test stuff
 
 xbt_tests =                                                      \
+        xbt/ex_test                                              \
        xbt/dynar_int    xbt/dynar_double   xbt/dynar_string     \
-       xbt/dict_usage   xbt/dict_crash                          \
+       xbt/dict_usage   xbt/dict_crash     xbt/multidict_crash  \
        xbt/set_usage                                            \
        xbt/log_usage                                            \
        xbt/heap_bench                                           \
        xbt/swag_usage                                           \
        xbt/context_usage                                        \
        xbt/config_usage
-# xbt/multidict_crash 
 
 RL_tests =                                              \
        gras/trp_tcp_client   gras/trp_tcp_server       \
@@ -37,8 +36,7 @@ RL_tests =                                              \
 
 SG_tests =                                              \
        surf/maxmin_usage surf/maxmin_bench \
-       surf/trace_usage surf/surf_usage surf/surf_usage2 \
-       msg/msg_test
+       surf/trace_usage surf/surf_usage surf/surf_usage2
 
 noinst_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
@@ -53,6 +51,8 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 LDADD_SG=$(top_builddir)/src/libsimgrid.la 
 LDADD_RL=$(top_builddir)/src/libgras.la   
 
+xbt_ex_test_LDADD=            $(LDADD_RL)
+
 xbt_log_usage_LDADD=          $(LDADD_RL)
 
 xbt_dynar_int_LDADD=          $(LDADD_RL)
@@ -61,7 +61,7 @@ xbt_dynar_string_LDADD=       $(LDADD_RL)
 
 xbt_dict_usage_LDADD=         $(LDADD_RL)
 xbt_dict_crash_LDADD=         $(LDADD_RL)
-#xbt_multidict_crash_LDADD=    $(LDADD_RL)
+xbt_multidict_crash_LDADD=    $(LDADD_RL)
 
 xbt_set_usage_LDADD=          $(LDADD_RL)
 xbt_swag_usage_LDADD=         $(LDADD_RL)
@@ -78,8 +78,6 @@ surf_trace_usage_LDADD=       $(LDADD_SG)
 surf_surf_usage_LDADD=        $(LDADD_SG)
 surf_surf_usage2_LDADD=       $(LDADD_SG)
 
-msg_msg_test_LDADD=           $(LDADD_SG)
-
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)
 gras_trp_file_client_LDADD=    $(LDADD_RL)