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

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 8c1c3f65c9..5ad009ddf6 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,31 +1,39 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
+CLEANFILES = *~ test a.out *.o datadesc_usage.out 
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/*
+MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
-  datadesc.little32 datadesc.little64 datadesc.big32 datadesc.big64 \
-  mk_datadesc_structs.pl
+  gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
+  gras/datadesc.aix \
+  gras/mk_datadesc_structs.pl \
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt
 
-# Test stuff
-
-core_tests =                                  \
-	dynar_int dynar_double dynar_string   \
-	dict_usage dict_crash                 \
-	set_usage                             \
-	log_usage                             \
-	config_usage
-# multidict_crash 
-
-RL_tests =                                    \
-	trp_tcp_client   trp_tcp_server       \
-	trp_file_client  trp_file_server      \
-	datadesc_usage
 
-SG_tests =
+# Test stuff
 
-noinst_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
-noinst_SCRIPTS = run_tests trp_tcp_usage
+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/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
+
+SG_tests =                                              \
+	surf/maxmin_usage surf/maxmin_bench \
+	surf/trace_usage surf/surf_usage
+
+check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
 test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@ -34,30 +42,38 @@ 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_srcdir)/src/base/libgrasrl.a 
-LDADD_RL=   $(top_srcdir)/src/base/libgrasrl.a   
+LDADD_UTILS=$(top_builddir)/src/libgrasrl.la 
+LDADD_RL=   $(top_builddir)/src/libgrasrl.la   
+
+xbt_log_usage_LDADD=          $(LDADD_UTILS)
+
+xbt_dynar_int_LDADD=          $(LDADD_UTILS)
+xbt_dynar_double_LDADD=       $(LDADD_UTILS)
+xbt_dynar_string_LDADD=       $(LDADD_UTILS)
 
-log_usage_LDADD=          $(LDADD_UTILS)
+xbt_dict_usage_LDADD=         $(LDADD_UTILS)
+xbt_dict_crash_LDADD=         $(LDADD_UTILS)
+#xbt_multidict_crash_LDADD=    $(LDADD_UTILS)
 
-dynar_int_LDADD=          $(LDADD_UTILS)
-dynar_double_LDADD=       $(LDADD_UTILS)
-dynar_string_LDADD=       $(LDADD_UTILS)
+xbt_set_usage_LDADD=          $(LDADD_UTILS)
+xbt_swag_usage_LDADD=         $(LDADD_UTILS)
 
-dict_usage_LDADD=         $(LDADD_UTILS)
-dict_crash_LDADD=         $(LDADD_UTILS)
-#multidict_crash_LDADD=    $(LDADD_UTILS)
+xbt_config_usage_LDADD=       $(LDADD_UTILS)
 
-set_usage_LDADD=          $(LDADD_UTILS)
+xbt_heap_bench_LDADD=         $(LDADD_UTILS)
 
-config_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)
 
-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_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)
 
-datadesc_usage_SOURCES= datadesc_usage.c datadesc_structs.c
-datadesc_usage_LDADD=     $(LDADD_RL)
+gras_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_LDADD=     $(LDADD_RL)
 
-datadesc_structs.c: mk_datadesc_structs.pl
-	perl mk_datadesc_structs.pl > datadesc_structs.c
+gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
+	cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c