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

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 106a861bf1..b2e98d7d8c 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,41 +1,56 @@
-INCLUDES = -I$(top_srcdir)/src/include
-AM_CFLAGS=-g -Wno-unused-function 
-AM_LDFLAGS=-g
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
+AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
+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
 
-noinst_PROGRAMS =                             \
-	dynar_int dynar_double dynar_string   \
-	dict_usage dict_crash                 \
-	log_usage                             \
-	config_usage                          
-	\
-	gs_example_send gs_example_receive
-	
-# multidict_crash 
+xbt_tests =                                                      \
+	xbt/log_usage                                            \
+	xbt/heap_bench                                           \
+	xbt/graphxml_usage                                       \
+	xbt/context_usage                                        
 
+SG_tests =                                              \
+	surf/maxmin_bench surf/lmm_usage \
+	surf/trace_usage surf/surf_usage surf/surf_usage2
 
-noinst_SCRIPTS = run_tests gs_example
+simdag_tests = simdag/sd_test
 
-dynar_int_LDADD=          $(top_srcdir)/src/base/libgrasutils.a
-dynar_double_LDADD=       $(top_srcdir)/src/base/libgrasutils.a
-dynar_string_LDADD=       $(top_srcdir)/src/base/libgrasutils.a
+check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag_tests)
+check_SCRIPTS = run_tests gras/trp_tcp_usage
+TESTS=run_tests
 
-dict_usage_LDADD=         $(top_srcdir)/src/base/libgrasutils.a
-dict_crash_LDADD=         $(top_srcdir)/src/base/libgrasutils.a
-multidict_crash_LDADD=    $(top_srcdir)/src/base/libgrasutils.a
+test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
+	./run_tests
+valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
+	./run_tests valgrind
 
-config_usage_LDADD=       $(top_srcdir)/src/base/libgrasutils.a
+# LDADD_UTILS is still a separate var to distinguish core tester from RL tester
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(abs_top_builddir)/src/libgras.la   
 
-log_usage_LDADD=           $(top_srcdir)/src/base/libgrasutils.a
+xbt_log_usage_LDADD=          $(LDADD_RL)
 
-gs_example_send_LDADD=    $(top_srcdir)/src/base/libgrasutils.a
-gs_example_receive_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+xbt_heap_bench_LDADD=         $(LDADD_RL)
+xbt_parallel_log_crashtest_LDADD=  $(LDADD_RL)
 
-TESTS=run_tests
+xbt_graphxml_usage_LDADD=     $(LDADD_SG)
 
-test: $(noinst_PROGRAMS)
-	./run_tests
+xbt_context_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)
+
+simdag_sd_test_LDADD=       $(LDADD_SG)
+
+include $(top_srcdir)/acmacro/dist-files.mk