X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17ccf2e27ae2bc121dcd9e2d541f7a6c02492432..543fcfdbc4aa5fdf9e85605758784253536fc624:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index dc9c2d8765..d66715563e 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,14 +1,20 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS=-g
 
 CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
-DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/*
+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.win32 gras/datadesc.g5 \
+  gras/datadesc.little32 gras/datadesc.little32_4 \
+  gras/datadesc.little64\
+  gras/datadesc.big32 gras/datadesc.big32_8_4 \
   gras/mk_datadesc_structs.pl \
-  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml \
+  msg/messages.h
+
+# Data sets still to regenerate:
+# gras/datadesc.big64 
+# gras/datadesc.big32_4 gras/datadesc.big32_2 
 
 
 # Test stuff
@@ -20,6 +26,7 @@ xbt_tests =                                                      \
 	xbt/log_usage                                            \
 	xbt/heap_bench                                           \
 	xbt/swag_usage                                           \
+	xbt/context_usage                                        \
 	xbt/config_usage
 # xbt/multidict_crash 
 
@@ -30,9 +37,10 @@ RL_tests =                                              \
 
 SG_tests =                                              \
 	surf/maxmin_usage surf/maxmin_bench \
-	surf/trace_usage surf/surf_usage surf/surf_usage2
+	surf/trace_usage surf/surf_usage surf/surf_usage2 \
+	msg/msg_test
 
-check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+noinst_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
@@ -42,8 +50,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)
 
@@ -61,6 +69,7 @@ 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)
@@ -68,6 +77,8 @@ 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)
 gras_trp_file_client_LDADD=    $(LDADD_RL)