-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
XLIB = -lgcov
endif
-if ENABLE_LL
- ll_binaries = \
- gnunet-testbed-mpi-spawn
-endif
-
libexecdir= $(pkglibdir)/libexec/
pkgcfgdir= $(pkgdatadir)/config.d/
pkgcfg_DATA = \
testbed.conf
+if HAVE_SQLITE
+ underlay_daemon = gnunet-daemon-testbed-underlay
+ latency_logger = gnunet-daemon-latency-logger
+ generate_underlay = generate-underlay-topology
+ underlay_testcases = test_testbed_underlay
+endif
+
libexec_PROGRAMS = \
gnunet-service-testbed \
gnunet-helper-testbed \
- gnunet-service-testbed-logger
+ gnunet-daemon-testbed-blacklist \
+ $(underlay_daemon) \
+ $(latency_logger)
bin_PROGRAMS = \
- $(ll_binaries) \
gnunet-testbed-profiler
+noinst_PROGRAMS = \
+ $(generate_underlay)
+
gnunet_service_testbed_SOURCES = \
- gnunet-service-testbed.h \
- gnunet-service-testbed.c \
- gnunet-service-testbed_links.c \
+ gnunet-service-testbed.c gnunet-service-testbed.h \
+ gnunet-service-testbed_links.c gnunet-service-testbed_links.h \
gnunet-service-testbed_peers.c \
gnunet-service-testbed_cache.c \
gnunet-service-testbed_oc.c \
gnunet-service-testbed_cpustatus.c \
- gnunet-service-testbed_meminfo.c \
- gnunet-service-testbed_meminfo.h \
- gnunet-service-testbed_barriers.c
+ gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \
+ gnunet-service-testbed_barriers.c \
+ gnunet-service-testbed_connectionpool.c gnunet-service-testbed_connectionpool.h
gnunet_service_testbed_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
+ libgnunettestbed.la \
$(top_builddir)/src/arm/libgnunetarm.la \
$(LTLIBINTL) $(Z_LIBS)
-gnunet_service_testbed_DEPENDENCIES = \
- libgnunettestbed.la
-
-gnunet_service_testbed_logger_SOURCES = \
- gnunet-service-testbed-logger.c
-gnunet_service_testbed_logger_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
gnunet_testbed_profiler_SOURCES = \
gnunet-testbed-profiler.c
gnunet_testbed_profiler_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-gnunet_testbed_profiler_DEPENDENCIES = \
libgnunettestbed.la
gnunet_helper_testbed_SOURCES = \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunettestbed.la \
$(LTLIBINTL) $(Z_LIBS)
-gnunet_helper_testbed_DEPENDENCIES = \
- gnunet-service-testbed.$(OBJEXT) \
- libgnunettestbed.la
-gnunet_testbed_mpi_spawn_SOURCES = gnunet_testbed_mpi_spawn.c
-gnunet_testbed_mpi_spawn_LDADD = $(XLIB) \
+gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c
+gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-gnunet_testbed_mpi_spawn_DEPENDENCIES = \
+ $(LTLIBINTL)
+
+gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c
+gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \
+ $(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la \
- libgnunettestbed.la
+ $(LTLIBINTL) -lsqlite3
+
+gnunet_daemon_latency_logger_SOURCES = gnunet-daemon-latency-logger.c
+gnunet_daemon_latency_logger_LDADD = $(XLIB) \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL) -lsqlite3
lib_LTLIBRARIES = \
- libgnunettestbed.la \
- libgnunettestbedlogger.la
+ libgnunettestbed.la
libgnunettestbed_la_SOURCES = \
testbed_api.c testbed_api.h testbed.h \
testbed_api_test.c \
testbed_api_topology.c testbed_api_topology.h \
testbed_api_sd.c testbed_api_sd.h \
- testbed_api_barriers.c
+ testbed_api_barriers.c testbed_api_barriers.h
libgnunettestbed_la_LIBADD = $(XLIB) \
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(GN_LIB_LDFLAGS) \
-version-info 0:0:0
-libgnunettestbedlogger_la_SOURCES = \
- testbed_logger_api.c
-libgnunettestbedlogger_la_LIBADD = $(XLIB) \
+generate_underlay_topology_SOURCES = generate-underlay-topology.c
+generate_underlay_topology_LDADD = $(XLIB) \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunettestbedlogger_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
+ libgnunettestbed.la \
+ $(LTLIBINTL) -lsqlite3
check_PROGRAMS = \
test_testbed_api_hosts \
- test_testbed_logger_api \
test_gnunet_helper_testbed \
test_testbed_api_controllerlink \
test_testbed_api_2peers_1controller \
test_testbed_api_testbed_run_topologyfromfile \
test_testbed_api_testbed_run_topologyscalefree \
test_testbed_api_testbed_run_waitforever \
- test_testbed_api_statistics
+ test_testbed_api_statistics \
+ gnunet-service-test-barriers \
+ test_testbed_api_barriers \
+ $(underlay_testcases)
if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
TESTS = \
test_testbed_api \
- test_testbed_logger_api \
test_testbed_api_sd \
test_testbed_api_operations \
test_testbed_api_hosts \
test_testbed_api_testbed_run_topologysmallworld \
test_testbed_api_testbed_run_topologysmallworldring \
test_testbed_api_testbed_run_topologyfromfile \
- test_testbed_api_testbed_run_topologyscalefree
+ test_testbed_api_testbed_run_topologyscalefree \
+ test_testbed_api_barriers \
+ $(underlay_testcases)
endif
test_testbed_api_hosts_SOURCES = \
$(top_builddir)/src/arm/libgnunetarm.la \
libgnunettestbed.la
-test_testbed_logger_api_SOURCES = \
- test_testbed_logger_api.c
-test_testbed_logger_api_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- libgnunettestbedlogger.la
-
test_testbed_api_sd_SOURCES = \
test_testbed_api_sd.c
test_testbed_api_sd_LDADD = \
test_gnunet_helper_testbed_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la \
- $(Z_LIBZ)
+ $(Z_LIBS)
test_testbed_api_testbed_run_topologyrandom_SOURCES = \
test_testbed_api_testbed_run.c
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
+test_testbed_api_barriers_SOURCES = \
+ test_testbed_api_barriers.c \
+ test_testbed_api_barriers.h
+test_testbed_api_barriers_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+gnunet_service_test_barriers_SOURCES = \
+ gnunet-service-test-barriers.c \
+ test_testbed_api_barriers.h
+gnunet_service_test_barriers_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_underlay_SOURCES = \
+ test_testbed_underlay.c
+test_testbed_underlay_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
EXTRA_DIST = \
test_testbed_api.conf \
+ test_testbed_api_statistics.conf \
test_testbed_api_test_timeout.conf \
+ test_testbed_api_template.conf \
test_testbed_api_testbed_run_topologyring.conf \
test_testbed_api_testbed_run_topologyclique.conf \
test_testbed_api_testbed_run_topologyline.conf \
test_testbed_api_testbed_run_topologysmallworld.conf \
test_testbed_api_testbed_run_topologyfromfile.conf \
test_testbed_api_testbed_run_topologyscalefree.conf \
+ test_testbed_api_barriers.conf.in \
overlay_topology.txt \
sample_hosts.txt \
- sample.job
+ sample.job \
+ test_testbed_underlay.conf.in \
+ test-underlay.sqlite