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

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 106a861bf1..72e1fa58ac 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,41 +1,58 @@
 INCLUDES = -I$(top_srcdir)/src/include
 AM_CFLAGS=-g -Wno-unused-function 
-AM_LDFLAGS=-g
 
 CLEANFILES = *~ test a.out *.o
 DISTCLEANFILES=Makefile.in *~
+EXTRA_DIST=test_utils.c run_tests.in
 
 # Test stuff
 
-noinst_PROGRAMS =                             \
+core_tests =                                  \
 	dynar_int dynar_double dynar_string   \
 	dict_usage dict_crash                 \
+	set_usage                             \
 	log_usage                             \
-	config_usage                          
-	\
-	gs_example_send gs_example_receive
-	
+	config_usage
 # multidict_crash 
 
+RL_tests =                                    \
+	trp_tcp_client   trp_tcp_server       \
+	trp_file_client  trp_file_server      \
+	datadesc_usage
 
-noinst_SCRIPTS = run_tests gs_example
+SG_tests =
 
-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
+noinst_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
+noinst_SCRIPTS = run_tests 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_UTILS=$(top_srcdir)/src/base/libgrasrl.a 
+LDADD_RL=   $(top_srcdir)/src/base/libgrasrl.a   
 
-log_usage_LDADD=           $(top_srcdir)/src/base/libgrasutils.a
+log_usage_LDADD=          $(LDADD_UTILS)
 
-gs_example_send_LDADD=    $(top_srcdir)/src/base/libgrasutils.a
-gs_example_receive_LDADD= $(top_srcdir)/src/base/libgrasutils.a
+dynar_int_LDADD=          $(LDADD_UTILS)
+dynar_double_LDADD=       $(LDADD_UTILS)
+dynar_string_LDADD=       $(LDADD_UTILS)
 
-TESTS=run_tests
+dict_usage_LDADD=         $(LDADD_UTILS)
+dict_crash_LDADD=         $(LDADD_UTILS)
+#multidict_crash_LDADD=    $(LDADD_UTILS)
+
+set_usage_LDADD=          $(LDADD_UTILS)
+
+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)
+
+datadesc_usage_LDADD=     $(LDADD_RL)
 
-test: $(noinst_PROGRAMS)
-	./run_tests