- distribute peers equally among island nodes on SuperMUC

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 871b648670ddb3a185c9890d77118482f3152f0d..3f3d6db550870e378bb687e4cc89fcbdbcc0d0a6 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -83,7 +83,8 @@ gnunet_testbed_mpi_spawn_DEPENDENCIES = \
  libgnunettestbed.la
 
 lib_LTLIBRARIES = \
-  libgnunettestbed.la
+  libgnunettestbed.la \
+  libgnunettestbedlogger.la
 
 libgnunettestbed_la_SOURCES = \
   testbed_api.c testbed_api.h testbed.h \
@@ -109,8 +110,18 @@ libgnunettestbed_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:0:0
 
+libgnunettestbedlogger_la_SOURCES = \
+  testbed_logger_api.c
+libgnunettestbedlogger_la_LIBADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunettestbedlogger_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
 check_PROGRAMS = \
   test_testbed_api_hosts \
+  test_testbed_logger_api \
   test_gnunet_helper_testbed \
   test_testbed_api_controllerlink \
   test_testbed_api_2peers_1controller \
@@ -121,6 +132,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 \
@@ -133,11 +145,13 @@ check_PROGRAMS = \
   test_testbed_api_testbed_run_topologysmallworld \
   test_testbed_api_testbed_run_topologyfromfile \
   test_testbed_api_testbed_run_topologyscalefree \
+  test_testbed_api_testbed_run_waitforever \
   test_testbed_api_statistics
 
 if ENABLE_TEST_RUN
  TESTS = \
   test_testbed_api \
+  test_testbed_logger_api \
   test_testbed_api_sd \
   test_testbed_api_operations \
   test_testbed_api_hosts \
@@ -149,6 +163,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 \
@@ -177,6 +192,13 @@ test_testbed_api_LDADD = \
  $(top_builddir)/src/dht/libgnunetdht.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 = \
@@ -300,6 +322,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 = \
@@ -312,6 +340,12 @@ 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
+
 EXTRA_DIST = \
   test_testbed_api.conf \
   test_testbed_api_test_timeout.conf \