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
Take into account last API modification. Sorry about that.
[simgrid.git]
/
testsuite
/
Makefile.am
diff --git
a/testsuite/Makefile.am
b/testsuite/Makefile.am
index
b53d51f
..
8402efb
100644
(file)
--- a/
testsuite/Makefile.am
+++ b/
testsuite/Makefile.am
@@
-1,13
+1,16
@@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
AM_CFLAGS=-g
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
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 \
gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
MAINTAINERCLEANFILES=Makefile.in
EXTRA_DIST=run_tests.in \
gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
- gras/datadesc.aix \
- gras/mk_datadesc_structs.pl
+ gras/datadesc.aix gras/datadesc.win32 gras/datadesc.g5 \
+ gras/mk_datadesc_structs.pl \
+ surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.txt \
+ msg/platform.txt
+
# Test stuff
# Test stuff
@@
-18,6
+21,7
@@
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
xbt/config_usage
# xbt/multidict_crash
@@
-27,7
+31,9
@@
RL_tests = \
gras/datadesc_usage
SG_tests = \
gras/datadesc_usage
SG_tests = \
- surf/maxmin_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)
check_SCRIPTS = run_tests gras/trp_tcp_usage
check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
check_SCRIPTS = run_tests gras/trp_tcp_usage
@@
-39,8
+45,8
@@
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
rl
.la
-LDADD_RL= $(top_builddir)/src/libgras
rl
.la
+LDADD_UTILS=$(top_builddir)/src/libgras.la
+LDADD_RL= $(top_builddir)/src/libgras.la
xbt_log_usage_LDADD= $(LDADD_UTILS)
xbt_log_usage_LDADD= $(LDADD_UTILS)
@@
-58,8
+64,15
@@
xbt_swag_usage_LDADD= $(LDADD_UTILS)
xbt_config_usage_LDADD= $(LDADD_UTILS)
xbt_heap_bench_LDADD= $(LDADD_UTILS)
xbt_config_usage_LDADD= $(LDADD_UTILS)
xbt_heap_bench_LDADD= $(LDADD_UTILS)
+xbt_context_usage_LDADD= $(LDADD_UTILS)
+
+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)
-
surf_maxmin_usage_LDADD=
$(LDADD_UTILS)
+
msg_msg_test_LDADD=
$(LDADD_UTILS)
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)