- verboser log, faster start

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 130014836b741ffdc296739323620cf7a66daa23..26b576deb6aa32dd179cdae837156211567fce65 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -9,6 +9,15 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+if WITH_LL
+  CC = mpcc
+  ll_noinst_binaries = \
+    ll-master \
+    ll-monitor 
+  ll_binaries = \
+    gnunet-mpi-test
+endif
+
 libexecdir= $(pkglibdir)/libexec/
 
 pkgcfgdir= $(pkgdatadir)/config.d/
@@ -20,11 +29,18 @@ libexec_PROGRAMS = \
   gnunet-service-testbed \
   gnunet-helper-testbed
 
+bin_PROGRAMS = \
+  $(ll_binaries)
+
 noinst_PROGRAMS = \
-  gnunet-testbed-profiler
+  gnunet-testbed-profiler \
+  $(ll_noinst_binaries)
 
 gnunet_service_testbed_SOURCES = \
-  gnunet-service-testbed.c
+  gnunet-service-testbed.c \
+  gnunet-service-testbed.h \
+  gnunet-service-testbed_cache.c \
+  gnunet-service-testbed_oc.c
 gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/core/libgnunetcore.la \
@@ -53,6 +69,21 @@ gnunet_helper_testbed_DEPENDENCIES = \
   gnunet-service-testbed.$(OBJEXT) \
   libgnunettestbed.la
 
+ll_master_SOURCES = \
+  ll_master.c
+ll_master_LDADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL) -lz -lllapi
+
+ll_monitor_SOURCES = \
+  ll_monitor.c
+ll_monitor_LDADD = $(XLIB) \
+ $(LTLIBINTL) -lz -lllapi
+
+gnunet_mpi_test_SOURCES = gnunet_mpi_test.c
+gnunet_mpi_test_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 lib_LTLIBRARIES = \
   libgnunettestbed.la
 
@@ -65,7 +96,8 @@ libgnunettestbed_la_SOURCES = \
   testbed_api_statistics.c \
   testbed_api_testbed.c \
   testbed_api_test.c \
-  testbed_api_topology.c testbed_api_topology.h
+  testbed_api_topology.c testbed_api_topology.h \
+  testbed_api_sd.c testbed_api_sd.h
 libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -80,27 +112,32 @@ libgnunettestbed_la_LDFLAGS = \
  -version-info 0:0:0
 
 check_PROGRAMS = \
- test_testbed_api_hosts \
- test_testbed_api_controllerlink \
- 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_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
+  test_testbed_api_hosts \
+  test_testbed_api_controllerlink \
+  test_testbed_api_2peers_1controller \
+  test_testbed_api_3peers_3controllers \
+  test_testbed_api \
+  test_testbed_api_sd \
+  test_testbed_api_operations \
+  test_testbed_api_testbed_run \
+  test_testbed_api_test \
+  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 \
+  test_testbed_api_testbed_run_topologysmallworld \
+  test_testbed_api_testbed_run_topologyfromfile \
+  test_testbed_api_testbed_run_topologyscalefree
 
 if ENABLE_TEST_RUN
  TESTS = \
   test_testbed_api \
+  test_testbed_api_sd \
   test_testbed_api_hosts \
   test_testbed_api_2peers_1controller \
   test_testbed_api_3peers_3controllers \
@@ -111,12 +148,15 @@ if ENABLE_TEST_RUN
   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
+  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 \
+  test_testbed_api_testbed_run_topologysmallworld \
+  test_testbed_api_testbed_run_topologyfromfile \
+  test_testbed_api_testbed_run_topologyscalefree
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -133,6 +173,12 @@ test_testbed_api_LDADD = \
  $(top_builddir)/src/dht/libgnunetdht.la \
  libgnunettestbed.la
 
+test_testbed_api_sd_SOURCES = \
+ test_testbed_api_sd.c
+test_testbed_api_sd_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
 test_testbed_api_2peers_1controller_SOURCES = \
  test_testbed_api_2peers_1controller.c
 test_testbed_api_2peers_1controller_LDADD = \
@@ -226,6 +272,24 @@ test_testbed_api_testbed_run_topology2dtorus_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
+test_testbed_api_testbed_run_topologysmallworld_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologysmallworld_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_testbed_run_topologyfromfile_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyfromfile_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_testbed_run_topologyscalefree_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyscalefree_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
 EXTRA_DIST = \
   test_testbed_api.conf \
   test_testbed_api_testbed_run_topologyring.conf \
@@ -234,4 +298,9 @@ EXTRA_DIST = \
   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
+  test_testbed_api_testbed_run_topologysmallworld.conf \
+  test_testbed_api_testbed_run_topologyfromfile.conf \
+  test_testbed_api_testbed_run_topologyscalefree.conf \
+  overlay_topology.txt \
+  sample_hosts.txt \
+  sample.job