X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d71f65d9d83ec974281885f4e2bcd1abb01e05e..7fc9fe25f03b219bd45664a5244b7487b89d1afc:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 8f2bed751b..fb394bce5d 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,41 +1,44 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include 
-AM_CFLAGS=-g
+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/* 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/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/msg_platform.xml msg/msg_deployment.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 
 
 
 # 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       \
 	gras/trp_file_client  gras/trp_file_server      \
-	gras/datadesc_usage
+	gras/datadesc_usage                             
 
 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
 
-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
 
@@ -45,42 +48,45 @@ 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/libgras.la 
-LDADD_RL=   $(top_builddir)/src/libgras.la   
+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_UTILS)
+xbt_log_usage_LDADD=          $(LDADD_RL)
 
-xbt_dynar_int_LDADD=          $(LDADD_UTILS)
-xbt_dynar_double_LDADD=       $(LDADD_UTILS)
-xbt_dynar_string_LDADD=       $(LDADD_UTILS)
+xbt_dynar_int_LDADD=          $(LDADD_RL)
+xbt_dynar_double_LDADD=       $(LDADD_RL)
+xbt_dynar_string_LDADD=       $(LDADD_RL)
 
-xbt_dict_usage_LDADD=         $(LDADD_UTILS)
-xbt_dict_crash_LDADD=         $(LDADD_UTILS)
-#xbt_multidict_crash_LDADD=    $(LDADD_UTILS)
+xbt_dict_usage_LDADD=         $(LDADD_RL)
+xbt_dict_crash_LDADD=         $(LDADD_RL)
+xbt_multidict_crash_LDADD=    $(LDADD_RL)
 
-xbt_set_usage_LDADD=          $(LDADD_UTILS)
-xbt_swag_usage_LDADD=         $(LDADD_UTILS)
+xbt_set_usage_LDADD=          $(LDADD_RL)
+xbt_swag_usage_LDADD=         $(LDADD_RL)
 
-xbt_config_usage_LDADD=       $(LDADD_UTILS)
+xbt_config_usage_LDADD=       $(LDADD_RL)
 
-xbt_heap_bench_LDADD=         $(LDADD_UTILS)
-xbt_context_usage_LDADD=      $(LDADD_UTILS)
+xbt_heap_bench_LDADD=         $(LDADD_RL)
 
-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)
+xbt_context_usage_LDADD=      $(LDADD_SG)
 
-msg_msg_test_LDADD=           $(LDADD_UTILS)
+surf_maxmin_usage_LDADD=      $(LDADD_SG)
+surf_maxmin_bench_LDADD=      $(LDADD_SG)
+surf_trace_usage_LDADD=       $(LDADD_SG)
+surf_surf_usage_LDADD=        $(LDADD_SG)
+surf_surf_usage2_LDADD=       $(LDADD_SG)
 
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)
 gras_trp_file_client_LDADD=    $(LDADD_RL)
 gras_trp_file_server_LDADD=    $(LDADD_RL)
 
-gras_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_SOURCES=   gras/datadesc_usage.c gras/datadesc_structs.c
 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