GNUNET_TESTBED_run and test cases

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

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 8a3912f5bf2c139066acad1f720c568c19464333..229e89ba1986c7fb8c0b504ba366194bb6f0d88a 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -15,23 +15,39 @@ pkgcfg_DATA = \
   testbed.conf
 
 bin_PROGRAMS = \
-  gnunet-service-testbed
+  gnunet-service-testbed \
+  gnunet-testbed-helper
 
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.c
 gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(LTLIBINTL) -lz
 gnunet_service_testbed_DEPENDENCIES = \
   libgnunettestbed.la
 
+gnunet_testbed_helper_SOURCES = \
+  gnunet-testbed-helper.c
+gnunet_testbed_helper_LDADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettestbed.la \
+ $(LTLIBINTL) -lz
+gnunet_testbed_helper_DEPENDENCIES = \
+  gnunet-service-testbed.$(OBJEXT) \
+  libgnunettestbed.la
+
 lib_LTLIBRARIES = \
   libgnunettestbed.la
 
 libgnunettestbed_la_SOURCES = \
-  testbed_api.c testbed.h \
-  testbed_api_hosts.c testbed_api_hosts.h \
+  testbed_api.c testbed_api.h testbed.h \
+  testbed_api_hosts.c testbed_api_hosts.h testbed_helper.h \
   testbed_api_operations.c testbed_api_operations.h \
   testbed_api_peers.c testbed_api_peers.h \
   testbed_api_services.c \
@@ -45,6 +61,7 @@ libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/hello/libgnunethello.la \
  -lm \
  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(LTLIBINTL)
 libgnunettestbed_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
@@ -52,10 +69,21 @@ libgnunettestbed_la_LDFLAGS = \
 
 check_PROGRAMS = \
  test_testbed_api_hosts \
- test_testbed_api
+ test_testbed_api_controllerlink \
+ test_testbed_api_2peers \
+ test_testbed_api \
+ test_testbed_api_operations \
+ test_testbed_api_testbed_run \
+ test_gnunet_testbed_helper
 
 if ENABLE_TEST_RUN
-  TESTS = $(check_PROGRAMS)
+ TESTS = \
+  test_testbed_api \
+  test_testbed_api_hosts \
+  test_testbed_api_2peers \
+  test_testbed_api_operations \
+  test_gnunet_testbed_helper \
+  test_testbed_api_controllerlink
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -69,4 +97,37 @@ test_testbed_api_SOURCES = \
 test_testbed_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- libgnunettestbed.la
\ No newline at end of file
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ libgnunettestbed.la
+
+test_testbed_api_2peers_SOURCES = \
+ test_testbed_api_2peers.c
+test_testbed_api_2peers_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettestbed.la
+
+test_testbed_api_operations_SOURCES = \
+ test_testbed_api_operations.c
+test_testbed_api_operations_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+test_testbed_api_controllerlink_SOURCES = \
+ test_testbed_api_controllerlink.c
+test_testbed_api_controllerlink_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+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_gnunet_testbed_helper_SOURCES = \
+ test_gnunet_testbed_helper.c
+test_gnunet_testbed_helper_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la \
+ -lz
\ No newline at end of file