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
adapt the prototypes of the declaration to the prototypes of the definition
[simgrid.git]
/
testsuite
/
Makefile.am
diff --git
a/testsuite/Makefile.am
b/testsuite/Makefile.am
index
72e1fa5
..
e25fe5c
100644
(file)
--- a/
testsuite/Makefile.am
+++ b/
testsuite/Makefile.am
@@
-1,29
+1,30
@@
-INCLUDES = -I$(top_srcdir)/src/include
-AM_CFLAGS=-g
-Wno-unused-function
+INCLUDES = -I$(top_srcdir)/
include -I$(top_srcdir)/src -I$(top_srcdir)/
src/include
+AM_CFLAGS=-g
-CLEANFILES = *~ test a.out *.o
-DISTCLEANFILES=Makefile.in *~
-EXTRA_DIST=test_utils.c run_tests.in
+CLEANFILES = *~ test a.out *.o testgraph.xml testgraph.dot
+DISTCLEANFILES = gras/.libs/* xbt/.libs/* surf/.libs/* msg/.libs/* simdag/.libs/*
+EXTRA_DIST=run_tests.in \
+ xbt/graph.xml \
+ surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt surf/platform.xml\
+ simdag/availability_tremblay.txt simdag/small_platform_variable.xml
+
# Test stuff
# Test stuff
-core_tests = \
- dynar_int dynar_double dynar_string \
- dict_usage dict_crash \
- set_usage \
- log_usage \
- config_usage
-# multidict_crash
+xbt_tests = \
+ xbt/log_usage \
+ xbt/heap_bench \
+ xbt/graphxml_usage \
+ xbt/context_usage
-RL_tests = \
- trp_tcp_client trp_tcp_server \
- trp_file_client trp_file_server \
- datadesc_usage
+SG_tests = \
+ surf/maxmin_bench surf/lmm_usage \
+ surf/trace_usage surf/surf_usage surf/surf_usage2
-SG_tests =
+simdag_tests = simdag/sd_test
-
noinst_PROGRAMS = $(core_tests) $(RL_tests) $(SG
_tests)
-noinst_SCRIPTS = run_tests trp_tcp_usage
+
check_PROGRAMS = $(xbt_tests) $(SG_tests) $(simdag
_tests)
+check_SCRIPTS = run_tests
TESTS=run_tests
test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
TESTS=run_tests
test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
@@
-32,27
+33,23
@@
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_srcdir)/src/base/libgrasrl.
a
-LDADD_RL=
$(top_srcdir)/src/base/libgrasrl.
a
+LDADD_
SG=$(abs_top_builddir)/src/libsimgrid.l
a
+LDADD_RL=
$(abs_top_builddir)/src/libgras.l
a
-
log_usage_LDADD= $(LDADD_UTILS
)
+
xbt_log_usage_LDADD= $(LDADD_RL
)
-dynar_int_LDADD= $(LDADD_UTILS)
-dynar_double_LDADD= $(LDADD_UTILS)
-dynar_string_LDADD= $(LDADD_UTILS)
+xbt_heap_bench_LDADD= $(LDADD_RL)
-dict_usage_LDADD= $(LDADD_UTILS)
-dict_crash_LDADD= $(LDADD_UTILS)
-#multidict_crash_LDADD= $(LDADD_UTILS)
+xbt_graphxml_usage_LDADD= $(LDADD_SG)
-
set_usage_LDADD= $(LDADD_UTILS
)
+
xbt_context_usage_LDADD= $(LDADD_SG
)
-config_usage_LDADD= $(LDADD_UTILS)
+surf_maxmin_bench_LDADD= $(LDADD_SG)
+surf_lmm_usage_LDADD= $(LDADD_SG)
+surf_trace_usage_LDADD= $(LDADD_SG)
+surf_surf_usage_LDADD= $(LDADD_SG)
+surf_surf_usage2_LDADD= $(LDADD_SG)
-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)
+simdag_sd_test_LDADD= $(LDADD_SG)
+include $(top_srcdir)/acmacro/dist-files.mk