X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2FMakefile.am;h=1428106a5173c4164f98e9fb4d0282bf6361a8be;hb=0f7e55e885e3d9c4e26432b53cf2cfe120df7cf5;hp=c959506f2ca770443edda0ed3cbea5b48ba83b93;hpb=7a88befe7fbe461fd646d727936e11b2973d3615;p=oweals%2Fgnunet.git

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index c959506f2..1428106a5 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -9,11 +9,6 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-if ENABLE_LL
-  ll_binaries = \
-    gnunet-testbed-mpi-spawn
-endif
-
 libexecdir= $(pkglibdir)/libexec/
 
 pkgcfgdir= $(pkgdatadir)/config.d/
@@ -21,55 +16,55 @@ 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
+  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_barriers.h \
-  gnunet-service-testbed_connectionpool.c \
-  gnunet-service-testbed_connectionpool.h
+  gnunet-service-testbed_meminfo.c gnunet-service-testbed_meminfo.h \
+  gnunet-service-testbed_barriers.c gnunet-service-testbed_barriers.h \
+  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/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_service_testbed_logger_DEPENDENCIES = \
- $(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 = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
@@ -80,26 +75,24 @@ gnunet_helper_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/testing/libgnunettesting.la \
  libgnunettestbed.la \
  $(LTLIBINTL) $(Z_LIBS)
-gnunet_helper_testbed_DEPENDENCIES = \
-  gnunet-service-testbed.$(OBJEXT) \
-  libgnunettestbed.la
 
 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 \
  $(LTLIBINTL)
-gnunet_daemon_testbed_blacklist_DEPENDENCIES = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
 
-gnunet_testbed_mpi_spawn_SOURCES = gnunet_testbed_mpi_spawn.c
-gnunet_testbed_mpi_spawn_LDADD = $(XLIB) \
+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 \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-gnunet_testbed_mpi_spawn_DEPENDENCIES = \
+ $(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 \
- libgnunettestbed.la
+ $(LTLIBINTL) -lsqlite3
 
 lib_LTLIBRARIES = \
   libgnunettestbed.la \
@@ -116,7 +109,7 @@ libgnunettestbed_la_SOURCES = \
   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 \
@@ -139,6 +132,12 @@ libgnunettestbedlogger_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:0:0
 
+generate_underlay_topology_SOURCES = generate-underlay-topology.c
+generate_underlay_topology_LDADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la \
+ $(LTLIBINTL) -lsqlite3
+
 check_PROGRAMS = \
   test_testbed_api_hosts \
   test_testbed_logger_api \
@@ -168,9 +167,11 @@ check_PROGRAMS = \
   test_testbed_api_testbed_run_waitforever \
   test_testbed_api_statistics \
   gnunet-service-test-barriers \
-  test_testbed_api_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 \
@@ -198,7 +199,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 = \
@@ -289,7 +291,7 @@ test_gnunet_helper_testbed_SOURCES = \
 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
@@ -375,8 +377,6 @@ test_testbed_api_barriers_SOURCES = \
 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_SOURCES = \
   gnunet-service-test-barriers.c \
@@ -385,9 +385,18 @@ 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_logger_api.conf \
   test_testbed_api_testbed_run_topologyring.conf \
   test_testbed_api_testbed_run_topologyclique.conf \
   test_testbed_api_testbed_run_topologyline.conf \
@@ -400,4 +409,6 @@ EXTRA_DIST = \
   test_testbed_api_barriers.conf.in \
   overlay_topology.txt \
   sample_hosts.txt \
-  sample.job
+  sample.job \
+  test_testbed_underlay.conf.in \
+  test-underlay.sqlite