Kill oldies; add the results of the test of graphxml

[simgrid.git] / testsuite / Makefile.am

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 6da5a7f..e446bf6 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,29 +1,38 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
-AM_CFLAGS=-g
+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\
+  testgraph.xml testgraph.dot
 
-CLEANFILES = *~ test a.out *.o datadesc_usage.out 
-DISTCLEANFILES =  gras/.libs/* xbt/.libs/*
-MAINTAINERCLEANFILES=Makefile.in
 EXTRA_DIST=run_tests.in \
-  gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
-  gras/mk_datadesc_structs.pl
+  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:
+# gras/datadesc.big64 
+# gras/datadesc.big32_4 
+
 
 # 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/config_usage
-# xbt/multidict_crash 
+       xbt/heap_bench                                           \
+       xbt/graphxml_usage                                       \
+       xbt/context_usage                                        
 
 RL_tests =                                              \
        gras/trp_tcp_client   gras/trp_tcp_server       \
        gras/trp_file_client  gras/trp_file_server      \
-       gras/datadesc_usage
+       gras/datadesc_usage                             
 
-SG_tests =
+SG_tests =                                              \
+       surf/maxmin_usage surf/maxmin_bench \
+       surf/trace_usage surf/surf_usage surf/surf_usage2
 
 check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
@@ -35,30 +44,32 @@ 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_builddir)/src/libgrasrl.la 
-LDADD_RL=   $(top_builddir)/src/libgrasrl.la   
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la 
+LDADD_RL=$(abs_top_builddir)/src/libgras.la   
 
-xbt_log_usage_LDADD=          $(LDADD_UTILS)
+xbt_log_usage_LDADD=          $(LDADD_RL)
 
-xbt_dynar_int_LDADD=          $(LDADD_UTILS)
-xbt_dynar_double_LDADD=       $(LDADD_UTILS)
-xbt_dynar_string_LDADD=       $(LDADD_UTILS)
+xbt_heap_bench_LDADD=         $(LDADD_RL)
 
-xbt_dict_usage_LDADD=         $(LDADD_UTILS)
-xbt_dict_crash_LDADD=         $(LDADD_UTILS)
-#xbt_multidict_crash_LDADD=    $(LDADD_UTILS)
+xbt_graphxml_usage_LDADD=     $(LDADD_SG)
 
-xbt_set_usage_LDADD=          $(LDADD_UTILS)
+xbt_context_usage_LDADD=      $(LDADD_SG)
 
-xbt_config_usage_LDADD=       $(LDADD_UTILS)
+surf_maxmin_usage_LDADD=      $(LDADD_SG)
+surf_maxmin_bench_LDADD=      $(LDADD_SG)
+surf_trace_usage_LDADD=       $(LDADD_SG)
+surf_surf_usage_LDADD=        $(LDADD_SG)
+surf_surf_usage2_LDADD=       $(LDADD_SG)
 
 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)
 
-gras_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c
+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