added testing configuration files

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index e37d0ce11d3c52ab060f46b93e4f702c45b962d5..128f99a3d1fc2f7ab2abd290b047e14758dcca40 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -9,12 +9,14 @@ 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
 
@@ -88,7 +90,10 @@ check_PROGRAMS = \
  test_testbed_api_test \
  test_gnunet_helper_testbed \
  test_testbed_api_topology \
- test_testbed_api_topology_clique
+ test_testbed_api_topology_clique \
+ test_testbed_api_testbed_run_topologyrandom \
+ test_testbed_api_testbed_run_topologyline \
+ test_testbed_api_testbed_run_topologyclique
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -102,7 +107,10 @@ if ENABLE_TEST_RUN
   test_testbed_api_testbed_run \
   test_testbed_api_test \
   test_testbed_api_topology \
-  test_testbed_api_topology_clique
+  test_testbed_api_topology_clique \
+ test_testbed_api_testbed_run_topologyrandom \
+ test_testbed_api_testbed_run_topologyline \
+ test_testbed_api_testbed_run_topologyclique
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -174,4 +182,29 @@ test_gnunet_helper_testbed_SOURCES = \
 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
+
+
+EXTRA_DIST = \
+  test_testbed_api.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