X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d5f7d3e7dbedf4c00607dd6b81df1a2e4391866..5d02d342bf2942a5e97d9d3599cbb7d94f3285a9:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 405ffd9ce5..3f6f0976b0 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,17 +1,19 @@
 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/* simdag/.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
-
+  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
+  
 # Data sets still to regenerate:
 # gras/datadesc.big64 
 # gras/datadesc.big32_4 
@@ -34,7 +36,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
 
@@ -44,8 +48,8 @@ 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)
 
@@ -70,6 +74,8 @@ 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
+
+simdag_sd_test_LDADD=       $(LDADD_SG)
 
 include $(top_srcdir)/acmacro/dist-files.mk