X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/147d85384fe57aa5af318362a3cf1e9c2ed1153c..5cd6f39e10e7f949b41348ba4a60f2b7f9285de0:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 0eeda01838..f695969678 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,14 +1,16 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 AM_CFLAGS=-g 
 
-CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
-DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/*
-MAINTAINERCLEANFILES=Makefile.in
+CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out\
+  testgraph.xml testgraph.dot
+DISTCLEANFILES =  gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* 
+
 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:
@@ -19,15 +21,10 @@ EXTRA_DIST=run_tests.in \
 # 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/context_usage                                        \
-	xbt/config_usage
-# xbt/multidict_crash 
+	xbt/graphxml_usage                                       \
+	xbt/context_usage                                        
 
 RL_tests =                                              \
 	gras/trp_tcp_client   gras/trp_tcp_server       \
@@ -38,7 +35,9 @@ SG_tests =                                              \
 	surf/maxmin_usage surf/maxmin_bench \
 	surf/trace_usage surf/surf_usage surf/surf_usage2
 
-noinst_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+simdag_tests = simdag/sd_test
+
+check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests) $(simdag_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
@@ -48,26 +47,15 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
 	./run_tests valgrind
 
 # LDADD_UTILS is still a separate var to distinguish core tester from RL tester
-LDADD_SG=$(top_builddir)/src/libsimgrid.la 
-LDADD_RL=$(top_builddir)/src/libgras.la   
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(abs_top_builddir)/src/libgras.la   
 
 xbt_log_usage_LDADD=          $(LDADD_RL)
 
-xbt_dynar_int_LDADD=          $(LDADD_RL)
-xbt_dynar_double_LDADD=       $(LDADD_RL)
-xbt_dynar_string_LDADD=       $(LDADD_RL)
-
-xbt_dict_usage_LDADD=         $(LDADD_RL)
-xbt_dict_crash_LDADD=         $(LDADD_RL)
-#xbt_multidict_crash_LDADD=    $(LDADD_RL)
-
-xbt_set_usage_LDADD=          $(LDADD_RL)
-xbt_swag_usage_LDADD=         $(LDADD_RL)
-
-xbt_config_usage_LDADD=       $(LDADD_RL)
-
 xbt_heap_bench_LDADD=         $(LDADD_RL)
 
+xbt_graphxml_usage_LDADD=     $(LDADD_SG)
+
 xbt_context_usage_LDADD=      $(LDADD_SG)
 
 surf_maxmin_usage_LDADD=      $(LDADD_SG)
@@ -85,6 +73,6 @@ 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
+	cd gras ; perl ../$(top_srcdir)/testsuite/gras/mk_datadesc_structs.pl > datadesc_structs.c
 
 include $(top_srcdir)/acmacro/dist-files.mk