X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/61764813056545e4dd2de7c8eceb0c13eb84d4ec..5c0986b18d4d1c135bb89eb086cdf7c3c6a04c31:/testsuite/Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index b008d3d2e1..69d8654c09 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,31 +1,32 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
 AM_CFLAGS=-g
 
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
+CLEANFILES = *~ test a.out *.o datadesc_usage.out 
+DISTCLEANFILES =  gras/.libs/* gros/.libs/*
+MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
-  datadesc.little32 datadesc.little64 datadesc.big32 datadesc.big64 \
-  mk_datadesc_structs.pl
+  gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
+  gras/mk_datadesc_structs.pl
 
 # Test stuff
 
-core_tests =                                  \
-	dynar_int dynar_double dynar_string   \
-	dict_usage dict_crash                 \
-	set_usage                             \
-	log_usage                             \
-	config_usage
-# multidict_crash 
+gros_tests =                                                      \
+	gros/dynar_int    gros/dynar_double   gros/dynar_string   \
+	gros/dict_usage   gros/dict_crash                         \
+	gros/set_usage                                            \
+	gros/log_usage                                            \
+	gros/config_usage
+# gros/multidict_crash 
 
-RL_tests =                                    \
-	trp_tcp_client   trp_tcp_server       \
-	trp_file_client  trp_file_server      \
-	datadesc_usage
+RL_tests =                                              \
+	gras/trp_tcp_client   gras/trp_tcp_server       \
+	gras/trp_file_client  gras/trp_file_server      \
+	gras/datadesc_usage
 
 SG_tests =
 
-noinst_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
-noinst_SCRIPTS = run_tests trp_tcp_usage
+check_PROGRAMS = $(gros_tests) $(RL_tests) $(SG_tests)
+check_SCRIPTS = run_tests gras/trp_tcp_usage
 TESTS=run_tests
 
 test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@ -34,30 +35,30 @@ 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.la 
-LDADD_RL=   $(top_srcdir)/src/base/libgrasrl.la   
+LDADD_UTILS=$(top_builddir)/src/libgrasrl.la 
+LDADD_RL=   $(top_builddir)/src/libgrasrl.la   
 
-log_usage_LDADD=          $(LDADD_UTILS)
+gros_log_usage_LDADD=          $(LDADD_UTILS)
 
-dynar_int_LDADD=          $(LDADD_UTILS)
-dynar_double_LDADD=       $(LDADD_UTILS)
-dynar_string_LDADD=       $(LDADD_UTILS)
+gros_dynar_int_LDADD=          $(LDADD_UTILS)
+gros_dynar_double_LDADD=       $(LDADD_UTILS)
+gros_dynar_string_LDADD=       $(LDADD_UTILS)
 
-dict_usage_LDADD=         $(LDADD_UTILS)
-dict_crash_LDADD=         $(LDADD_UTILS)
-#multidict_crash_LDADD=    $(LDADD_UTILS)
+gros_dict_usage_LDADD=         $(LDADD_UTILS)
+gros_dict_crash_LDADD=         $(LDADD_UTILS)
+#gros_multidict_crash_LDADD=    $(LDADD_UTILS)
 
-set_usage_LDADD=          $(LDADD_UTILS)
+gros_set_usage_LDADD=          $(LDADD_UTILS)
 
-config_usage_LDADD=       $(LDADD_UTILS)
+gros_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)
+gras_trp_tcp_client_LDADD=     $(LDADD_RL)
+gras_trp_tcp_server_LDADD=     $(LDADD_RL)
+gras_trp_file_client_LDADD=    $(LDADD_RL)
+gras_trp_file_server_LDADD=    $(LDADD_RL)
 
-datadesc_usage_SOURCES= datadesc_usage.c datadesc_structs.c
-datadesc_usage_LDADD=     $(LDADD_RL)
+gras_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c
+gras_datadesc_usage_LDADD=     $(LDADD_RL)
 
-datadesc_structs.c: mk_datadesc_structs.pl
-	perl mk_datadesc_structs.pl > datadesc_structs.c
+gras/datadesc_structs.c: gras/mk_datadesc_structs.pl
+	cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c