Remove this useless select since windows cannot select on files handles, only on...

[simgrid.git] / testsuite / Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 405ffd9..d910889 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,9 +1,10 @@
 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\
@@ -34,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
 
@@ -44,8 +47,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 +73,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