- de-duplication

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 5efaef97ef7c9ad736a780ba32927c7079c5a2f0..130014836b741ffdc296739323620cf7a66daa23 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -9,15 +9,20 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 pkgcfg_DATA = \
   testbed.conf
 
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
   gnunet-service-testbed \
   gnunet-helper-testbed
 
+noinst_PROGRAMS = \
+  gnunet-testbed-profiler
+
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.c
 gnunet_service_testbed_LDADD = $(XLIB) \
@@ -31,6 +36,12 @@ gnunet_service_testbed_LDADD = $(XLIB) \
 gnunet_service_testbed_DEPENDENCIES = \
   libgnunettestbed.la
 
+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) \
@@ -54,7 +65,7 @@ libgnunettestbed_la_SOURCES = \
   testbed_api_statistics.c \
   testbed_api_testbed.c \
   testbed_api_test.c \
-  testbed_api_topology.c
+  testbed_api_topology.c testbed_api_topology.h
 libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -71,23 +82,41 @@ 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_testbed_api_testbed_run \
  test_testbed_api_test \
- test_gnunet_helper_testbed
+ test_gnunet_helper_testbed \
+ test_testbed_api_topology \
+ test_testbed_api_topology_clique \
+ test_testbed_api_testbed_run_topologyrandom \
+ test_testbed_api_testbed_run_topologyline \
+ test_testbed_api_testbed_run_topologyclique \
+ test_testbed_api_testbed_run_topologyring \
+ test_testbed_api_testbed_run_topologysmallworldring \
+ test_testbed_api_testbed_run_topology2dtorus
 
 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_helper_testbed \
   test_testbed_api_controllerlink \
   test_testbed_api_testbed_run \
-  test_testbed_api_test
+  test_testbed_api_test \
+  test_testbed_api_topology \
+  test_testbed_api_topology_clique \
+ test_testbed_api_testbed_run_topologyrandom \
+ test_testbed_api_testbed_run_topologyline \
+ test_testbed_api_testbed_run_topologyclique \
+ test_testbed_api_testbed_run_topologyring \
+ test_testbed_api_testbed_run_topologysmallworldring \
+ test_testbed_api_testbed_run_topology2dtorus
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -104,9 +133,16 @@ test_testbed_api_LDADD = \
  $(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
@@ -135,9 +171,67 @@ 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_testbed_api_topology_clique_SOURCES = \
+ test_testbed_api_topology_clique.c
+test_testbed_api_topology_clique_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
+ -lz
+
+test_testbed_api_testbed_run_topologyrandom_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyrandom_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_testbed_run_topologyline_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyline_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_testbed_run_topologyclique_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyclique_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_testbed_run_topologyring_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyring_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_testbed_run_topologysmallworldring_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologysmallworldring_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_testbed_run_topology2dtorus_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topology2dtorus_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+EXTRA_DIST = \
+  test_testbed_api.conf \
+  test_testbed_api_testbed_run_topologyring.conf \
+  test_testbed_api_testbed_run_topologyclique.conf \
+  test_testbed_api_testbed_run_topologyline.conf \
+  test_testbed_api_testbed_run_topologyrandom.conf \
+  test_testbed_api_testbed_run_topologysmallworldring.conf \
+  test_testbed_api_testbed_run_topology2dtorus.conf \
+  sample_hosts.txt
\ No newline at end of file