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

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index aaeb36b5a1..ce548f845a 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,29 +1,36 @@
-INCLUDES = -I$(top_srcdir)/src/include
-AM_CFLAGS=-g -Wno-unused-function 
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
 
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
-EXTRA_DIST=run_tests.in
+# 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.
 
+
+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
 
-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                                       
 
-RL_tests =                                    \
-	trp_tcp_client   trp_tcp_server       \
-	trp_file_client  trp_file_server      \
-	datadesc_usage
+SG_tests =                                              \
+	surf/maxmin_bench surf/lmm_usage \
+	surf/trace_usage surf/surf_usage surf/surf_usage2
 
-SG_tests =
+simdag_tests = simdag/sd_test
 
-noinst_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
-noinst_SCRIPTS = run_tests trp_tcp_usage
+check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag_tests)
+check_SCRIPTS = run_tests 
 TESTS=run_tests
 
 test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@ -32,27 +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_srcdir)/src/base/libgrasrl.a 
-LDADD_RL=   $(top_srcdir)/src/base/libgrasrl.a   
-
-log_usage_LDADD=          $(LDADD_UTILS)
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(abs_top_builddir)/src/libgras.la   
 
-dynar_int_LDADD=          $(LDADD_UTILS)
-dynar_double_LDADD=       $(LDADD_UTILS)
-dynar_string_LDADD=       $(LDADD_UTILS)
+xbt_log_usage_LDADD=          $(LDADD_RL)
 
-dict_usage_LDADD=         $(LDADD_UTILS)
-dict_crash_LDADD=         $(LDADD_UTILS)
-#multidict_crash_LDADD=    $(LDADD_UTILS)
+xbt_heap_bench_LDADD=         $(LDADD_RL)
 
-set_usage_LDADD=          $(LDADD_UTILS)
+xbt_graphxml_usage_LDADD=     $(LDADD_SG)
 
-config_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)
+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)
 
-datadesc_usage_LDADD=     $(LDADD_RL)
+simdag_sd_test_LDADD=       $(LDADD_SG)
 
+include $(top_srcdir)/acmacro/dist-files.mk