X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30cc0c481881dac4d9764b64b35049798dad47c9..0450dbf72458f8c636206f2e823edf31840c95fa:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index ac03e25f48..75d4718796 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,13 +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/*
+CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.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/mk_datadesc_structs.pl
+  gras/mk_datadesc_structs.pl \
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt
+
 
 # Test stuff
 
@@ -17,6 +19,7 @@ xbt_tests =                                                      \
 	xbt/set_usage                                            \
 	xbt/log_usage                                            \
 	xbt/heap_bench                                           \
+	xbt/swag_usage                                           \
 	xbt/config_usage
 # xbt/multidict_crash 
 
@@ -25,7 +28,9 @@ RL_tests =                                              \
 	gras/trp_file_client  gras/trp_file_server      \
 	gras/datadesc_usage
 
-SG_tests =
+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
@@ -51,9 +56,17 @@ xbt_dict_crash_LDADD=         $(LDADD_UTILS)
 #xbt_multidict_crash_LDADD=    $(LDADD_UTILS)
 
 xbt_set_usage_LDADD=          $(LDADD_UTILS)
+xbt_swag_usage_LDADD=         $(LDADD_UTILS)
 
 xbt_config_usage_LDADD=       $(LDADD_UTILS)
 
+xbt_heap_bench_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)
+
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)
 gras_trp_file_client_LDADD=    $(LDADD_RL)