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
kill a calloc
[simgrid.git]
/
testsuite
/
Makefile.am
diff --git
a/testsuite/Makefile.am
b/testsuite/Makefile.am
index
cf25ec8
..
93da8f0
100644
(file)
--- a/
testsuite/Makefile.am
+++ b/
testsuite/Makefile.am
@@
-1,14
+1,20
@@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
+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
datadesc_usage.out
-DISTCLEANFILES = gras/.libs/* xbt/.libs/* surf/.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 \
MAINTAINERCLEANFILES=Makefile.in
EXTRA_DIST=run_tests.in \
- gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
- gras/datadesc.aix \
+ gras/datadesc.little32 gras/datadesc.little32_4 \
+ gras/datadesc.little64\
+ gras/datadesc.big32 gras/datadesc.big32_8_4 \
gras/mk_datadesc_structs.pl \
gras/mk_datadesc_structs.pl \
- surf/trace_A.txt surf/trace_B.txt
+ surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml \
+ msg/messages.h
+
+# Data sets still to regenerate:
+# gras/datadesc.big64
+# gras/datadesc.big32_4 gras/datadesc.big32_2
# Test stuff
# Test stuff
@@
-20,18
+26,21
@@
xbt_tests = \
xbt/log_usage \
xbt/heap_bench \
xbt/swag_usage \
xbt/log_usage \
xbt/heap_bench \
xbt/swag_usage \
+ xbt/context_usage \
xbt/config_usage
# xbt/multidict_crash
RL_tests = \
gras/trp_tcp_client gras/trp_tcp_server \
gras/trp_file_client gras/trp_file_server \
xbt/config_usage
# xbt/multidict_crash
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/trace_usage
+ surf/maxmin_usage surf/maxmin_bench \
+ surf/trace_usage surf/surf_usage surf/surf_usage2 \
+ msg/msg_test
-
check
_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+
noinst
_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
@@
-41,36
+50,45
@@
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/libgrasrl.la
-LDADD_RL= $(top_builddir)/src/libgrasrl.la
+LDADD_SG=$(top_builddir)/src/libsimgrid.la
+LDADD_RL=$(top_builddir)/src/libgras.la
+
+xbt_log_usage_LDADD= $(LDADD_RL)
-xbt_log_usage_LDADD= $(LDADD_UTILS)
+xbt_dynar_int_LDADD= $(LDADD_RL)
+xbt_dynar_double_LDADD= $(LDADD_RL)
+xbt_dynar_string_LDADD= $(LDADD_RL)
-xbt_d
ynar_int_LDADD= $(LDADD_UTILS
)
-xbt_d
ynar_double_LDADD= $(LDADD_UTILS
)
-
xbt_dynar_string_LDADD= $(LDADD_UTILS
)
+xbt_d
ict_usage_LDADD= $(LDADD_RL
)
+xbt_d
ict_crash_LDADD= $(LDADD_RL
)
+
#xbt_multidict_crash_LDADD= $(LDADD_RL
)
-xbt_dict_usage_LDADD= $(LDADD_UTILS)
-xbt_dict_crash_LDADD= $(LDADD_UTILS)
-#xbt_multidict_crash_LDADD= $(LDADD_UTILS)
+xbt_set_usage_LDADD= $(LDADD_RL)
+xbt_swag_usage_LDADD= $(LDADD_RL)
-xbt_set_usage_LDADD= $(LDADD_UTILS)
-xbt_swag_usage_LDADD= $(LDADD_UTILS)
+xbt_config_usage_LDADD= $(LDADD_RL)
-xbt_
config_usage_LDADD= $(LDADD_UTILS
)
+xbt_
heap_bench_LDADD= $(LDADD_RL
)
-xbt_
heap_bench_LDADD= $(LDADD_UTILS
)
+xbt_
context_usage_LDADD= $(LDADD_SG
)
-surf_maxmin_usage_LDADD= $(LDADD_UTILS)
-surf_trace_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)
+
+msg_msg_test_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_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
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
+
+include $(top_srcdir)/acmacro/dist-files.mk