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

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 1ad5a6cf5c..ce548f845a 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,39 +1,36 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
-AM_CFLAGS=-g
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
 
-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/datadesc.win32 gras/datadesc.g5 \
-  gras/mk_datadesc_structs.pl \
-  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
+AM_CFLAGS=-g
+
+CLEANFILES = *~ test a.out *.o testgraph.xml testgraph.dot
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/*
 
+EXTRA_DIST=run_tests.in \
+  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
+  
 # Test stuff
 
 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
+	xbt/graphxml_usage                                       
 
 SG_tests =                                              \
-	surf/maxmin_usage surf/maxmin_bench \
-	surf/trace_usage surf/surf_usage
+	surf/maxmin_bench surf/lmm_usage \
+	surf/trace_usage surf/surf_usage surf/surf_usage2
+
+simdag_tests = simdag/sd_test
 
-check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
-check_SCRIPTS = run_tests gras/trp_tcp_usage
+check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag_tests)
+check_SCRIPTS = run_tests 
 TESTS=run_tests
 
 test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@ -42,38 +39,22 @@ 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/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)
-
-xbt_dict_usage_LDADD=         $(LDADD_UTILS)
-xbt_dict_crash_LDADD=         $(LDADD_UTILS)
-#xbt_multidict_crash_LDADD=    $(LDADD_UTILS)
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(abs_top_builddir)/src/libgras.la   
 
-xbt_set_usage_LDADD=          $(LDADD_UTILS)
-xbt_swag_usage_LDADD=         $(LDADD_UTILS)
+xbt_log_usage_LDADD=          $(LDADD_RL)
 
-xbt_config_usage_LDADD=       $(LDADD_UTILS)
+xbt_heap_bench_LDADD=         $(LDADD_RL)
 
-xbt_heap_bench_LDADD=         $(LDADD_UTILS)
+xbt_graphxml_usage_LDADD=     $(LDADD_SG)
 
-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)
-gras_trp_file_server_LDADD=    $(LDADD_RL)
+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_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c
-gras_datadesc_usage_LDADD=     $(LDADD_RL)
+simdag_sd_test_LDADD=       $(LDADD_SG)
 
-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