- relaxed to accommodate overlay linking timeouts

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 0e703750b15c7c20e20ceba2d5ff07fb0d2c3425..ec371e59db24231f90a47f928633c065d49882e2 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -16,7 +16,10 @@ pkgcfg_DATA = \
 
 bin_PROGRAMS = \
   gnunet-service-testbed \
-  gnunet-testbed-helper
+  gnunet-helper-testbed
+
+noinst_PROGRAMS = \
+  gnunet-testbed-profiler
 
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.c
@@ -31,14 +34,20 @@ gnunet_service_testbed_LDADD = $(XLIB) \
 gnunet_service_testbed_DEPENDENCIES = \
   libgnunettestbed.la
 
-gnunet_testbed_helper_SOURCES = \
-  gnunet-testbed-helper.c
-gnunet_testbed_helper_LDADD = $(XLIB) \
+gnunet_testbed_profiler_SOURCES = \
+  gnunet-testbed-profiler.c
+gnunet_testbed_profiler_LDADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+gnunet_helper_testbed_SOURCES = \
+  gnunet-helper-testbed.c
+gnunet_helper_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  libgnunettestbed.la \
  $(LTLIBINTL) -lz
-gnunet_testbed_helper_DEPENDENCIES = \
+gnunet_helper_testbed_DEPENDENCIES = \
   gnunet-service-testbed.$(OBJEXT) \
   libgnunettestbed.la
 
@@ -51,6 +60,7 @@ libgnunettestbed_la_SOURCES = \
   testbed_api_operations.c testbed_api_operations.h \
   testbed_api_peers.c testbed_api_peers.h \
   testbed_api_services.c \
+  testbed_api_statistics.c \
   testbed_api_testbed.c \
   testbed_api_test.c \
   testbed_api_topology.c
@@ -70,18 +80,27 @@ libgnunettestbed_la_LDFLAGS = \
 check_PROGRAMS = \
  test_testbed_api_hosts \
  test_testbed_api_controllerlink \
- test_testbed_api_2peers \
+ test_testbed_api_2peers_1controller \
+ test_testbed_api_3peers_3controllers \
  test_testbed_api \
  test_testbed_api_operations \
- test_gnunet_testbed_helper
+ test_testbed_api_testbed_run \
+ test_testbed_api_test \
+ test_gnunet_helper_testbed \
+ test_testbed_api_topology
 
 if ENABLE_TEST_RUN
  TESTS = \
   test_testbed_api \
   test_testbed_api_hosts \
-  test_testbed_api_2peers \
+  test_testbed_api_2peers_1controller \
+  test_testbed_api_3peers_3controllers \
   test_testbed_api_operations \
-  test_gnunet_testbed_helper
+  test_gnunet_helper_testbed \
+  test_testbed_api_controllerlink \
+  test_testbed_api_testbed_run \
+  test_testbed_api_test \
+  test_testbed_api_topology
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -95,11 +114,19 @@ 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 \
  libgnunettestbed.la
 
-test_testbed_api_2peers_SOURCES = \
- test_testbed_api_2peers.c
-test_testbed_api_2peers_LDADD = \
+test_testbed_api_2peers_1controller_SOURCES = \
+ test_testbed_api_2peers_1controller.c
+test_testbed_api_2peers_1controller_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettestbed.la
+
+test_testbed_api_3peers_3controllers_SOURCES = \
+ test_testbed_api_3peers_3controllers.c
+test_testbed_api_3peers_3controllers_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  libgnunettestbed.la
@@ -116,9 +143,27 @@ test_testbed_api_controllerlink_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
-test_gnunet_testbed_helper_SOURCES = \
- test_gnunet_testbed_helper.c
-test_gnunet_testbed_helper_LDADD = \
+test_testbed_api_testbed_run_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_test_SOURCES = \
+ test_testbed_api_test.c
+test_testbed_api_test_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_topology_SOURCES = \
+ test_testbed_api_topology.c
+test_testbed_api_topology_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_gnunet_helper_testbed_SOURCES = \
+ test_gnunet_helper_testbed.c
+test_gnunet_helper_testbed_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la \
  -lz
\ No newline at end of file