X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9dbe49c065ae48f80aa760e91c09964cb8a9225..b5a228e9f620ee4d9fb76dd276cf6fc2913b081f:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 3edc2e3ca0..167d9212bf 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
-AM_CFLAGS=-g
+AM_CFLAGS=-g 
 
 CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
 DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/*
@@ -7,28 +7,21 @@ MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
   gras/datadesc.little32 gras/datadesc.little32_4 \
   gras/datadesc.little64\
-  gras/datadesc.big32 gras/datadesc.big32_8_4 \
+  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 
-# gras/datadesc.big32_4 gras/datadesc.big32_2 
+# gras/datadesc.big32_4 
 
 
 # Test stuff
 
 xbt_tests =                                                      \
-	xbt/dynar_int    xbt/dynar_double   xbt/dynar_string     \
-	xbt/dict_usage   xbt/dict_crash                          \
-	xbt/set_usage                                            \
 	xbt/log_usage                                            \
 	xbt/heap_bench                                           \
-	xbt/swag_usage                                           \
-	xbt/context_usage                                        \
-	xbt/config_usage
-# xbt/multidict_crash 
+	xbt/context_usage                                        
 
 RL_tests =                                              \
 	gras/trp_tcp_client   gras/trp_tcp_server       \
@@ -37,8 +30,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 +45,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 +55,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 +72,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)
@@ -90,3 +82,5 @@ gras_datadesc_usage_LDADD=     $(LDADD_RL)
 
 gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
 	cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c
+
+include $(top_srcdir)/acmacro/dist-files.mk