X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d5a550c9ac944a71ea5f8e87ecef9e310fe497d..337a6d86b619fe07f2f2b15aa369651f3f157a9f:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index b588e71a77..e25fe5c4d2 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,23 +1,14 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
-AM_CFLAGS=-g 
+AM_CFLAGS=-g
+
+CLEANFILES = *~ test a.out *.o testgraph.xml testgraph.dot
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/*
 
-CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
-  testgraph.xml graph.dot
-DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* 
-MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
-  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
-
-# Data sets still to regenerate:
-# gras/datadesc.big64 
-# gras/datadesc.big32_4 
-
-
+  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
+  
 # Test stuff
 
 xbt_tests =                                                      \
@@ -26,17 +17,14 @@ xbt_tests =                                                      \
 	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                             
-
 SG_tests =                                              \
-	surf/maxmin_usage surf/maxmin_bench \
+	surf/maxmin_bench surf/lmm_usage \
 	surf/trace_usage surf/surf_usage surf/surf_usage2
 
-check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
-check_SCRIPTS = run_tests gras/trp_tcp_usage
+simdag_tests = simdag/sd_test
+
+check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag_tests)
+check_SCRIPTS = run_tests 
 TESTS=run_tests
 
 test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@ -56,21 +44,12 @@ xbt_graphxml_usage_LDADD=     $(LDADD_SG)
 
 xbt_context_usage_LDADD=      $(LDADD_SG)
 
-surf_maxmin_usage_LDADD=      $(LDADD_SG)
 surf_maxmin_bench_LDADD=      $(LDADD_SG)
+surf_lmm_usage_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_LDADD=     $(LDADD_RL)
-
-gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
-	cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c
+simdag_sd_test_LDADD=       $(LDADD_SG)
 
 include $(top_srcdir)/acmacro/dist-files.mk