A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removes the gras_config.h inclusion, adds the portable.h inclusion for win32 portability.
[simgrid.git]
/
testsuite
/
Makefile.am
diff --git
a/testsuite/Makefile.am
b/testsuite/Makefile.am
index
dc65a3f
..
eb0b028
100644
(file)
--- a/
testsuite/Makefile.am
+++ b/
testsuite/Makefile.am
@@
-1,34
+1,30
@@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/src/include
-AM_CFLAGS=-g
+AM_CFLAGS=-g
+
+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/*
-CLEANFILES = *~ test a.out *.o gras/datadesc_usage.out datadesc_usage.out
-DISTCLEANFILES = gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/*
-MAINTAINERCLEANFILES=Makefile.in
EXTRA_DIST=run_tests.in \
gras/datadesc.little32 gras/datadesc.little32_4 \
gras/datadesc.little64\
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 gras/datadesc.big32_8_4
gras/datadesc.big32_2
\
gras/mk_datadesc_structs.pl \
gras/mk_datadesc_structs.pl \
-
surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform
.xml \
- msg/messages.h
+
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
# Data sets still to regenerate:
# gras/datadesc.big64
-# gras/datadesc.big32_4
gras/datadesc.big32_2
+# gras/datadesc.big32_4
# Test stuff
xbt_tests = \
# 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/heap_bench \
xbt/log_usage \
xbt/heap_bench \
- xbt/swag_usage \
- xbt/context_usage \
- xbt/config_usage
-# xbt/multidict_crash
+ xbt/graphxml_usage \
+ xbt/context_usage
RL_tests = \
gras/trp_tcp_client gras/trp_tcp_server \
RL_tests = \
gras/trp_tcp_client gras/trp_tcp_server \
@@
-37,10
+33,9
@@
RL_tests = \
SG_tests = \
surf/maxmin_usage surf/maxmin_bench \
SG_tests = \
surf/maxmin_usage surf/maxmin_bench \
- surf/trace_usage surf/surf_usage surf/surf_usage2 \
- msg/msg_test
+ surf/trace_usage surf/surf_usage surf/surf_usage2
-
noinst
_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+
check
_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
check_SCRIPTS = run_tests gras/trp_tcp_usage
TESTS=run_tests
check_SCRIPTS = run_tests gras/trp_tcp_usage
TESTS=run_tests
@@
-50,34
+45,22
@@
valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
./run_tests valgrind
# LDADD_UTILS is still a separate var to distinguish core tester from RL tester
./run_tests valgrind
# LDADD_UTILS is still a separate var to distinguish core tester from RL tester
-LDADD_UTILS=$(top_builddir)/src/libgras.la
-LDADD_RL= $(top_builddir)/src/libgras.la
-
-xbt_log_usage_LDADD= $(LDADD_UTILS)
-
-xbt_dynar_int_LDADD= $(LDADD_UTILS)
-xbt_dynar_double_LDADD= $(LDADD_UTILS)
-xbt_dynar_string_LDADD= $(LDADD_UTILS)
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la
+LDADD_RL=$(abs_top_builddir)/src/libgras.la
-xbt_dict_usage_LDADD= $(LDADD_UTILS)
-xbt_dict_crash_LDADD= $(LDADD_UTILS)
-#xbt_multidict_crash_LDADD= $(LDADD_UTILS)
+xbt_log_usage_LDADD= $(LDADD_RL)
-xbt_set_usage_LDADD= $(LDADD_UTILS)
-xbt_swag_usage_LDADD= $(LDADD_UTILS)
+xbt_heap_bench_LDADD= $(LDADD_RL)
-xbt_
config_usage_LDADD= $(LDADD_UTILS
)
+xbt_
graphxml_usage_LDADD= $(LDADD_SG
)
-xbt_heap_bench_LDADD= $(LDADD_UTILS)
-xbt_context_usage_LDADD= $(LDADD_UTILS)
+xbt_context_usage_LDADD= $(LDADD_SG)
-surf_maxmin_usage_LDADD= $(LDADD_UTILS)
-surf_maxmin_bench_LDADD= $(LDADD_UTILS)
-surf_trace_usage_LDADD= $(LDADD_UTILS)
-surf_surf_usage_LDADD= $(LDADD_UTILS)
-surf_surf_usage2_LDADD= $(LDADD_UTILS)
-
-msg_msg_test_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_tcp_client_LDADD= $(LDADD_RL)
gras_trp_tcp_server_LDADD= $(LDADD_RL)
@@
-88,4
+71,6
@@
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
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