- moved test code from testbed to testing

1 files changed, 41 insertions, 0 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 8b28e6e23..15469a310 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -11,10 +11,43 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 dist_pkgcfg_DATA = \
   testing.conf
 
+libexec_PROGRAMS = \
+  gnunet-cmds-helper
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+  libgnunet_test_testing_plugin_testcmd.la
+
 lib_LTLIBRARIES = \
   libgnunettesting.la
 
+gnunet_cmds_helper_SOURCES = \
+  gnunet-cmds-helper.c
+gnunet_cmds_helper_LDADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettesting.la \
+ $(LTLIBINTL) $(Z_LIBS)
+
+libgnunet_test_testing_plugin_testcmd_la_SOURCES = \
+  test_testing_plugin_testcmd.c
+libgnunet_test_testing_plugin_testcmd_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunettesting.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(LTLIBINTL)
+libgnunet_test_testing_plugin_testcmd_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
 libgnunettesting_la_SOURCES = \
+  testing_api_cmd_local_test_finished.c \
+  testing_api_cmd_send_peer_ready.c \
+  testing_api_cmd_block_until_all_peers_started.c \
+  testing_api_cmd_netjail_start.c \
+  testing_api_cmd_netjail_start_testsystem.c \
+  testing_api_cmd_netjail_stop_testsystem.c \
+  testing_api_cmd_netjail_stop.c \
   testing.c testing.h \
   testing_api_cmd_system_create.c \
   testing_api_cmd_batch.c \
@@ -56,6 +89,7 @@ list_keys_LDADD = \
 
 
 check_PROGRAMS = \
+ test_testing_api_cmd_netjail \
  test_testing_hello_world \
  test_testing_portreservation \
  test_testing_servicestartup \
@@ -66,6 +100,7 @@ check_PROGRAMS = \
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
+ test_testing_api_cmd_netjail \
  test_testing_hello_world \
  test_testing_portreservation \
  test_testing_peerstartup \
@@ -73,6 +108,12 @@ TESTS = \
  test_testing_servicestartup
 endif
 
+test_testing_api_cmd_netjail_SOURCES = \
+ test_testing_api_cmd_netjail.c
+test_testing_api_cmd_netjail_LDADD = \
+ libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 test_testing_hello_world_SOURCES = \
  test_testing_hello_world.c
 test_testing_hello_world_LDADD = \