- de-duplication

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 128f99a3d1fc2f7ab2abd290b047e14758dcca40..130014836b741ffdc296739323620cf7a66daa23 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -65,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 \
@@ -93,7 +93,10 @@ check_PROGRAMS = \
  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_topologyclique \
+ test_testbed_api_testbed_run_topologyring \
+ test_testbed_api_testbed_run_topologysmallworldring \
+ test_testbed_api_testbed_run_topology2dtorus
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -110,7 +113,10 @@ if ENABLE_TEST_RUN
   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_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 = \
@@ -202,9 +208,30 @@ 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
\ No newline at end of file
+  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