X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28b7f1f95510fe2efa30fc2fb4b4d27826da931e..0b9a2447efffcac84def3c87a774040a45a0837e:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index e49653fc1f..56c6f9de78 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,14 +1,15 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o datadesc_usage.out 
-DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/*
+CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/*
 MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
   gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
-  gras/datadesc.aix \
+  gras/datadesc.aix gras/datadesc.win32 gras/datadesc.g5 \
   gras/mk_datadesc_structs.pl \
-  surf/trace_A.txt surf/trace_B.txt
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml \
+  msg/msg_platform.xml msg/msg_deployment.xml msg/messages.h
 
 
 # Test stuff
@@ -20,6 +21,7 @@ xbt_tests =                                                      \
 	xbt/log_usage                                            \
 	xbt/heap_bench                                           \
 	xbt/swag_usage                                           \
+	xbt/context_usage                                        \
 	xbt/config_usage
 # xbt/multidict_crash 
 
@@ -29,7 +31,9 @@ RL_tests =                                              \
 	gras/datadesc_usage
 
 SG_tests =                                              \
-	surf/maxmin_usage surf/trace_usage surf/surf_usage
+	surf/maxmin_usage surf/maxmin_bench \
+	surf/trace_usage surf/surf_usage surf/surf_usage2 \
+	msg/msg_test
 
 check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
@@ -41,8 +45,8 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 	./run_tests valgrind
 
 # LDADD_UTILS is still a separate var to distinguish core tester from RL tester
-LDADD_UTILS=$(top_builddir)/src/libgrasrl.la 
-LDADD_RL=   $(top_builddir)/src/libgrasrl.la   
+LDADD_UTILS=$(top_builddir)/src/libgras.la 
+LDADD_RL=   $(top_builddir)/src/libgras.la   
 
 xbt_log_usage_LDADD=          $(LDADD_UTILS)
 
@@ -60,10 +64,15 @@ xbt_swag_usage_LDADD=         $(LDADD_UTILS)
 xbt_config_usage_LDADD=       $(LDADD_UTILS)
 
 xbt_heap_bench_LDADD=         $(LDADD_UTILS)
+xbt_context_usage_LDADD=      $(LDADD_UTILS)
 
 surf_maxmin_usage_LDADD=      $(LDADD_UTILS)
+surf_maxmin_bench_LDADD=      $(LDADD_UTILS)
 surf_trace_usage_LDADD=       $(LDADD_UTILS)
 surf_surf_usage_LDADD=        $(LDADD_UTILS)
+surf_surf_usage2_LDADD=       $(LDADD_UTILS)
+
+msg_msg_test_LDADD=           $(LDADD_UTILS)
 
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)