-indentation

[oweals/gnunet.git] / src / testbed / Makefile.am

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 823ddaa836e7dfbddc510462506cacf71094ba75..a87ff5817f80e0e77a95138c7343272c458b055d 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -18,6 +18,7 @@ pkgcfg_DATA = \
 
 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
@@ -27,7 +28,8 @@ libexec_PROGRAMS = \
   gnunet-helper-testbed \
   gnunet-service-testbed-logger \
   gnunet-daemon-testbed-blacklist \
-  $(underlay_daemon)
+  $(underlay_daemon) \
+  $(latency_logger)
 
 bin_PROGRAMS = \
   gnunet-testbed-profiler
@@ -102,6 +104,15 @@ gnunet_daemon_testbed_underlay_DEPENDENCIES = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+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
+gnunet_daemon_latency_logger_DEPENDENCIES = \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 lib_LTLIBRARIES = \
   libgnunettestbed.la \
   libgnunettestbedlogger.la
@@ -182,6 +193,7 @@ check_PROGRAMS = \
   $(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 \
@@ -209,7 +221,8 @@ if ENABLE_TEST_RUN
   test_testbed_api_testbed_run_topologysmallworldring \
   test_testbed_api_testbed_run_topologyfromfile \
   test_testbed_api_testbed_run_topologyscalefree \
-  test_testbed_api_barriers
+  test_testbed_api_barriers \
+  $(underlay_testcases)
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -387,7 +400,7 @@ test_testbed_api_barriers_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 test_testbed_api_barriers_DEPENDENCIES = \
- gnunet-service-test-barriers
+ gnunet-service-test-barriers$(EXEEXT)
 
 gnunet_service_test_barriers_SOURCES = \
   gnunet-service-test-barriers.c \
@@ -404,6 +417,7 @@ test_testbed_underlay_LDADD = \
 
 EXTRA_DIST = \
   test_testbed_api.conf \
+  test_testbed_api_statistics.conf \
   test_testbed_api_test_timeout.conf \
   test_testbed_api_template.conf \
   test_testbed_logger_api.conf \