removing remenants of abstract unix domain socket handling, this finishes addressing...

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 3802cfebe000569ff21e7de79cdf93130ed85b82..f5d3647aebbfde50aabe3d1f018246406cac183c 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -24,7 +24,8 @@ pkgcfg_DATA = \
 libexec_PROGRAMS = \
   gnunet-service-testbed \
   gnunet-helper-testbed \
-  gnunet-service-testbed-logger
+  gnunet-service-testbed-logger \
+  gnunet-daemon-testbed-blacklist
 
 bin_PROGRAMS = \
   $(ll_binaries) \
@@ -37,7 +38,13 @@ gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed_peers.c \
   gnunet-service-testbed_cache.c \
   gnunet-service-testbed_oc.c \
-  gnunet-service-testbed_cpustatus.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_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/core/libgnunetcore.la \
@@ -46,7 +53,7 @@ gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/arm/libgnunetarm.la \
- $(LTLIBINTL) -lz
+ $(LTLIBINTL) $(Z_LIBS)
 gnunet_service_testbed_DEPENDENCIES = \
  libgnunettestbed.la
 
@@ -54,6 +61,8 @@ 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
@@ -61,6 +70,7 @@ 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
 
 gnunet_helper_testbed_SOURCES = \
@@ -69,11 +79,20 @@ gnunet_helper_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  libgnunettestbed.la \
- $(LTLIBINTL) -lz
+ $(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) \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -96,7 +115,8 @@ libgnunettestbed_la_SOURCES = \
   testbed_api_testbed.c \
   testbed_api_test.c \
   testbed_api_topology.c testbed_api_topology.h \
-  testbed_api_sd.c testbed_api_sd.h
+  testbed_api_sd.c testbed_api_sd.h \
+  testbed_api_barriers.c 
 libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -132,6 +152,7 @@ check_PROGRAMS = \
   test_testbed_api_testbed_run \
   test_testbed_api_test \
   test_testbed_api_test_timeout \
+  test_testbed_api_peer_reconfiguration \
   test_testbed_api_peers_manage_services \
   test_testbed_api_topology \
   test_testbed_api_topology_clique \
@@ -144,7 +165,10 @@ check_PROGRAMS = \
   test_testbed_api_testbed_run_topologysmallworld \
   test_testbed_api_testbed_run_topologyfromfile \
   test_testbed_api_testbed_run_topologyscalefree \
-  test_testbed_api_statistics
+  test_testbed_api_testbed_run_waitforever \
+  test_testbed_api_statistics \
+  gnunet-service-test-barriers \
+  test_testbed_api_barriers
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -161,6 +185,7 @@ if ENABLE_TEST_RUN
   test_testbed_api_test \
   test_testbed_api_test_timeout \
   test_testbed_api_statistics \
+  test_testbed_api_peer_reconfiguration \
   test_testbed_api_peers_manage_services \
   test_testbed_api_topology \
   test_testbed_api_topology_clique \
@@ -172,7 +197,8 @@ if ENABLE_TEST_RUN
   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
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -186,7 +212,7 @@ test_testbed_api_SOURCES = \
 test_testbed_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/arm/libgnunetarm.la \
  libgnunettestbed.la
 
 test_testbed_logger_api_SOURCES = \
@@ -263,7 +289,7 @@ test_gnunet_helper_testbed_SOURCES = \
 test_gnunet_helper_testbed_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la \
- -lz
+ $(Z_LIBS)
 
 test_testbed_api_testbed_run_topologyrandom_SOURCES = \
  test_testbed_api_testbed_run.c
@@ -319,6 +345,12 @@ test_testbed_api_testbed_run_topologyscalefree_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
+test_testbed_api_testbed_run_waitforever_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_waitforever_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
 test_testbed_api_statistics_SOURCES = \
  test_testbed_api_statistics.c
 test_testbed_api_statistics_LDADD = \
@@ -331,6 +363,28 @@ test_testbed_api_peers_manage_services_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
+test_testbed_api_peer_reconfiguration_SOURCES = \
+ test_testbed_api_peer_reconfiguration.c
+test_testbed_api_peer_reconfiguration_LDADD = \
+ $(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
+test_testbed_api_barriers_DEPENDENCIES = \
+ gnunet-service-test-barriers
+
+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
+
 EXTRA_DIST = \
   test_testbed_api.conf \
   test_testbed_api_test_timeout.conf \
@@ -343,6 +397,7 @@ EXTRA_DIST = \
   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