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

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4fd3052259..dfbc2788b7 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,31 +1,48 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o datadesc_usage.out
-MAINTAINERCLEANFILES=Makefile.in
+CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
+  testgraph.xml testgraph.dot
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/*
+
 EXTRA_DIST=run_tests.in \
-  datadesc.little32 datadesc.little64 datadesc.big32 datadesc.big64 \
-  mk_datadesc_structs.pl
+  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 \
+  xbt/graph.xml \
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml\
+  simdag/availability_tremblay.txt simdag/small_platform_variable.xml
+  
+# Data sets still to regenerate:
+# gras/datadesc.big64 
+# gras/datadesc.big32_4 
+
 
 # Test stuff
 
-core_tests =                                  \
-	dynar_int dynar_double dynar_string   \
-	dict_usage dict_crash                 \
-	set_usage                             \
-	log_usage                             
-#	config_usage
-# multidict_crash 
+xbt_tests =                                                      \
+	xbt/log_usage                                            \
+	xbt/heap_bench                                           \
+	xbt/graphxml_usage                                       \
+	xbt/context_usage                                        
+
+RL_tests =                                              \
+	gras/trp_tcp_client   gras/trp_tcp_server       \
+	gras/trp_file_client  gras/trp_file_server      \
+	gras/datadesc_usage                             
 
-RL_tests =                                    \
-	trp_tcp_client   trp_tcp_server       \
-	trp_file_client  trp_file_server      \
-	datadesc_usage
+SG_tests =                                              \
+	surf/maxmin_usage surf/maxmin_bench surf/simeng_usage \
+	surf/trace_usage surf/surf_usage surf/surf_usage2
+#if HAVE_SDP
+#  SG_tests+=surf/sdp_usage
+#endif
 
-SG_tests =
+simdag_tests = simdag/sd_test
 
-check_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
-check_SCRIPTS = run_tests trp_tcp_usage
+check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests) $(simdag_tests)
+check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
 test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@ -34,30 +51,40 @@ 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/base/libgrasrl.la 
-LDADD_RL=   $(top_builddir)/src/base/libgrasrl.la   
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(abs_top_builddir)/src/libgras.la   
+
+xbt_log_usage_LDADD=          $(LDADD_RL)
+
+xbt_heap_bench_LDADD=         $(LDADD_RL)
 
-log_usage_LDADD=          $(LDADD_UTILS)
+xbt_graphxml_usage_LDADD=     $(LDADD_SG)
 
-dynar_int_LDADD=          $(LDADD_UTILS)
-dynar_double_LDADD=       $(LDADD_UTILS)
-dynar_string_LDADD=       $(LDADD_UTILS)
+xbt_context_usage_LDADD=      $(LDADD_SG)
 
-dict_usage_LDADD=         $(LDADD_UTILS)
-dict_crash_LDADD=         $(LDADD_UTILS)
-#multidict_crash_LDADD=    $(LDADD_UTILS)
+surf_maxmin_usage_LDADD=      $(LDADD_SG)
+surf_maxmin_bench_LDADD=      $(LDADD_SG)
+surf_simeng_usage_LDADD=      $(LDADD_SG)
+surf_simeng_bench_LDADD=      $(LDADD_SG)
+surf_trace_usage_LDADD=       $(LDADD_SG)
+surf_surf_usage_LDADD=        $(LDADD_SG)
+surf_surf_usage2_LDADD=       $(LDADD_SG)
+#if HAVE_SDP
+#surf_sdp_usage_LDADD=         $(LDADD_SG)
+#surf_sdp_bench_LDADD=         $(LDADD_SG)
+#endif
 
-set_usage_LDADD=          $(LDADD_UTILS)
+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)
 
-config_usage_LDADD=       $(LDADD_UTILS)
+gras_datadesc_usage_SOURCES=   gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_LDADD=     $(LDADD_RL)
 
-trp_tcp_client_LDADD=     $(LDADD_RL)
-trp_tcp_server_LDADD=     $(LDADD_RL)
-trp_file_client_LDADD=    $(LDADD_RL)
-trp_file_server_LDADD=    $(LDADD_RL)
+gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
+	cd gras ; perl ../$(top_srcdir)/testsuite/gras/mk_datadesc_structs.pl > datadesc_structs.c
 
-datadesc_usage_SOURCES= datadesc_usage.c datadesc_structs.c
-datadesc_usage_LDADD=     $(LDADD_RL)
+simdag_sd_test_LDADD=       $(LDADD_SG)
 
-datadesc_structs.c: mk_datadesc_structs.pl
-	perl mk_datadesc_structs.pl > datadesc_structs.c
+include $(top_srcdir)/acmacro/dist-files.mk