move testing to src/lib/, fix compiler warnings

47 files changed, 44 insertions, 44 deletions

diff --git a/configure.ac b/configure.ac
index 316257f97..2cb170bdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1235,6 +1235,7 @@ src/lib/gnsrecord/Makefile
 src/lib/json/Makefile
 src/lib/pq/Makefile
 src/lib/sq/Makefile
+src/lib/testing/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/datacache/Makefile
@@ -1303,7 +1304,6 @@ src/service/setu/Makefile
 src/service/setu/setu.conf
 src/service/statistics/Makefile
 src/service/statistics/statistics.conf
-src/service/testing/Makefile
 src/service/topology/Makefile
 src/service/transport/Makefile
 src/service/transport/transport.conf
diff --git a/src/include/gnunet_testing_loop_lib.h b/src/include/gnunet_testing_loop_lib.h
index c9c59dc58..f1af2bbe8 100644
--- a/src/include/gnunet_testing_loop_lib.h
+++ b/src/include/gnunet_testing_loop_lib.h
@@ -145,7 +145,7 @@ typedef enum GNUNET_GenericReturnValue
  * Create a new command
  *
  * @param cls the closure
- * @param label the Label. Maximum length is GNUNET_TESTING_CMD_MAX_LABEL_LENGTH
+ * @param label the Label. Maximum length is #GNUNET_TESTING_CMD_MAX_LABEL_LENGTH
  * @param run the run routing
  * @param cleanup the cleanup function
  * @param traits the traits function (optional)
@@ -153,12 +153,13 @@ typedef enum GNUNET_GenericReturnValue
  * @return the command the function cannot fail
  */
 struct GNUNET_TESTING_Command
-GNUNET_TESTING_command_new (void *cls,
-                            const char *label,
-                            GNUNET_TESTING_CommandRunRoutine run,
-                            GNUNET_TESTING_CommandCleanupRoutine cleanup,
-                            GNUNET_TESTING_CommandGetTraits traits,
-                            struct GNUNET_TESTING_AsyncContext *ac);
+GNUNET_TESTING_command_new (
+  void *cls,
+  const char *label,
+  GNUNET_TESTING_CommandRunRoutine run,
+  GNUNET_TESTING_CommandCleanupRoutine cleanup,
+  GNUNET_TESTING_CommandGetTraits traits,
+  struct GNUNET_TESTING_AsyncContext *ac);
 
 
 /**
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c9871d8c7..89a34b299 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,10 +4,11 @@ endif
 
 SUBDIRS = \
         util \
-        hello \
-        block \
-        gnsrecord \
         curl \
         json \
         sq \
-        $(POSTGRES_DIR)
+        $(POSTGRES_DIR) \
+        hello \
+        block \
+        gnsrecord \
+        testing
diff --git a/src/lib/meson.build b/src/lib/meson.build
index 41c662a4f..93dbf5c4d 100644
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -6,3 +6,4 @@ subdir('curl', if_found : [curl_dep])
 subdir('sq', if_found : [sqlite_dep])
 subdir('pq', if_found : [pq_dep])
 subdir('gnsrecord')
+subdir('testing')
diff --git a/src/service/testing/.gitignore b/src/lib/testing/.gitignore
index a1e77a8e4..a1e77a8e4 100644
--- a/src/service/testing/.gitignore
+++ b/src/lib/testing/.gitignore
diff --git a/src/service/testing/Makefile.am b/src/lib/testing/Makefile.am
index 5cd4aae9b..5cd4aae9b 100644
--- a/src/service/testing/Makefile.am
+++ b/src/lib/testing/Makefile.am
diff --git a/src/service/testing/gnunet-cmds-helper.c b/src/lib/testing/gnunet-cmds-helper.c
index a54191abf..a54191abf 100644
--- a/src/service/testing/gnunet-cmds-helper.c
+++ b/src/lib/testing/gnunet-cmds-helper.c
diff --git a/src/service/testing/gnunet-testing.c b/src/lib/testing/gnunet-testing.c
index 88906e5fa..88906e5fa 100644
--- a/src/service/testing/gnunet-testing.c
+++ b/src/lib/testing/gnunet-testing.c
diff --git a/src/service/testing/list-keys.c b/src/lib/testing/list-keys.c
index f65b45a77..f65b45a77 100644
--- a/src/service/testing/list-keys.c
+++ b/src/lib/testing/list-keys.c
diff --git a/src/service/testing/meson.build b/src/lib/testing/meson.build
index ea8956c1b..ea8956c1b 100644
--- a/src/service/testing/meson.build
+++ b/src/lib/testing/meson.build
diff --git a/src/service/testing/test_testing_defaults.conf b/src/lib/testing/test_testing_defaults.conf
index 2e7c39113..2e7c39113 100644
--- a/src/service/testing/test_testing_defaults.conf
+++ b/src/lib/testing/test_testing_defaults.conf
diff --git a/src/service/testing/test_testing_peerstartup.c b/src/lib/testing/test_testing_peerstartup.c
index 25cbb2a9f..25cbb2a9f 100644
--- a/src/service/testing/test_testing_peerstartup.c
+++ b/src/lib/testing/test_testing_peerstartup.c
diff --git a/src/service/testing/test_testing_peerstartup2.c b/src/lib/testing/test_testing_peerstartup2.c
index 8d357cb08..8d357cb08 100644
--- a/src/service/testing/test_testing_peerstartup2.c
+++ b/src/lib/testing/test_testing_peerstartup2.c
diff --git a/src/service/testing/test_testing_portreservation.c b/src/lib/testing/test_testing_portreservation.c
index df3d8d523..df3d8d523 100644
--- a/src/service/testing/test_testing_portreservation.c
+++ b/src/lib/testing/test_testing_portreservation.c
diff --git a/src/service/testing/test_testing_servicestartup.c b/src/lib/testing/test_testing_servicestartup.c
index 83458898b..83458898b 100644
--- a/src/service/testing/test_testing_servicestartup.c
+++ b/src/lib/testing/test_testing_servicestartup.c
diff --git a/src/service/testing/test_testing_sharedservices.c b/src/lib/testing/test_testing_sharedservices.c
index d2f760d7a..d2f760d7a 100644
--- a/src/service/testing/test_testing_sharedservices.c
+++ b/src/lib/testing/test_testing_sharedservices.c
diff --git a/src/service/testing/test_testing_sharedservices.conf b/src/lib/testing/test_testing_sharedservices.conf
index 92eac7e71..92eac7e71 100644
--- a/src/service/testing/test_testing_sharedservices.conf
+++ b/src/lib/testing/test_testing_sharedservices.conf
diff --git a/src/service/testing/test_testing_start_with_config.c b/src/lib/testing/test_testing_start_with_config.c
index a2c692dbc..a2c692dbc 100644
--- a/src/service/testing/test_testing_start_with_config.c
+++ b/src/lib/testing/test_testing_start_with_config.c
diff --git a/src/service/testing/testing.c b/src/lib/testing/testing.c
index fdfa80d87..fdfa80d87 100644
--- a/src/service/testing/testing.c
+++ b/src/lib/testing/testing.c
diff --git a/src/service/testing/testing.conf b/src/lib/testing/testing.conf
index 7e25f8c13..7e25f8c13 100644
--- a/src/service/testing/testing.conf
+++ b/src/lib/testing/testing.conf
diff --git a/src/service/testing/testing.h b/src/lib/testing/testing.h
index 43c8ad45a..43c8ad45a 100644
--- a/src/service/testing/testing.h
+++ b/src/lib/testing/testing.h
diff --git a/src/service/testing/testing_api_cmd_barrier.c b/src/lib/testing/testing_api_cmd_barrier.c
index ee074f35b..ee074f35b 100644
--- a/src/service/testing/testing_api_cmd_barrier.c
+++ b/src/lib/testing/testing_api_cmd_barrier.c
diff --git a/src/service/testing/testing_api_cmd_barrier_reached.c b/src/lib/testing/testing_api_cmd_barrier_reached.c
index 54a36b91c..54a36b91c 100644
--- a/src/service/testing/testing_api_cmd_barrier_reached.c
+++ b/src/lib/testing/testing_api_cmd_barrier_reached.c
diff --git a/src/service/testing/testing_api_cmd_batch.c b/src/lib/testing/testing_api_cmd_batch.c
index 2f1faf288..2f1faf288 100644
--- a/src/service/testing/testing_api_cmd_batch.c
+++ b/src/lib/testing/testing_api_cmd_batch.c
diff --git a/src/service/testing/testing_api_cmd_block_until_external_trigger.c b/src/lib/testing/testing_api_cmd_block_until_external_trigger.c
index fc312cdc9..fc312cdc9 100644
--- a/src/service/testing/testing_api_cmd_block_until_external_trigger.c
+++ b/src/lib/testing/testing_api_cmd_block_until_external_trigger.c
diff --git a/src/service/testing/testing_api_cmd_exec_bash_script.c b/src/lib/testing/testing_api_cmd_exec_bash_script.c
index 171a2baac..171a2baac 100644
--- a/src/service/testing/testing_api_cmd_exec_bash_script.c
+++ b/src/lib/testing/testing_api_cmd_exec_bash_script.c
diff --git a/src/service/testing/testing_api_cmd_finish.c b/src/lib/testing/testing_api_cmd_finish.c
index e1fc69a09..e1fc69a09 100644
--- a/src/service/testing/testing_api_cmd_finish.c
+++ b/src/lib/testing/testing_api_cmd_finish.c
diff --git a/src/service/testing/testing_api_cmd_local_test_prepared.c b/src/lib/testing/testing_api_cmd_local_test_prepared.c
index 2b1525077..2b1525077 100644
--- a/src/service/testing/testing_api_cmd_local_test_prepared.c
+++ b/src/lib/testing/testing_api_cmd_local_test_prepared.c
diff --git a/src/service/testing/testing_api_cmd_netjail_start.c b/src/lib/testing/testing_api_cmd_netjail_start.c
index f45ab939b..f45ab939b 100644
--- a/src/service/testing/testing_api_cmd_netjail_start.c
+++ b/src/lib/testing/testing_api_cmd_netjail_start.c
diff --git a/src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c b/src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
index 792d7a8cf..792d7a8cf 100644
--- a/src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c
+++ b/src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
diff --git a/src/service/testing/testing_api_cmd_netjail_stop.c b/src/lib/testing/testing_api_cmd_netjail_stop.c
index cc05617f7..cc05617f7 100644
--- a/src/service/testing/testing_api_cmd_netjail_stop.c
+++ b/src/lib/testing/testing_api_cmd_netjail_stop.c
diff --git a/src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c b/src/lib/testing/testing_api_cmd_netjail_stop_cmds_helper.c
index c6bb0ab52..c6bb0ab52 100644
--- a/src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c
+++ b/src/lib/testing/testing_api_cmd_netjail_stop_cmds_helper.c
diff --git a/src/service/testing/testing_api_cmd_send_peer_ready.c b/src/lib/testing/testing_api_cmd_send_peer_ready.c
index f615a1cee..f615a1cee 100644
--- a/src/service/testing/testing_api_cmd_send_peer_ready.c
+++ b/src/lib/testing/testing_api_cmd_send_peer_ready.c
diff --git a/src/service/testing/testing_api_cmd_system_create.c b/src/lib/testing/testing_api_cmd_system_create.c
index 46fbd706e..46fbd706e 100644
--- a/src/service/testing/testing_api_cmd_system_create.c
+++ b/src/lib/testing/testing_api_cmd_system_create.c
diff --git a/src/service/testing/testing_api_cmd_system_destroy.c b/src/lib/testing/testing_api_cmd_system_destroy.c
index 45adfd0da..45adfd0da 100644
--- a/src/service/testing/testing_api_cmd_system_destroy.c
+++ b/src/lib/testing/testing_api_cmd_system_destroy.c
diff --git a/src/service/testing/testing_api_loop.c b/src/lib/testing/testing_api_loop.c
index beb9b9060..beb9b9060 100644
--- a/src/service/testing/testing_api_loop.c
+++ b/src/lib/testing/testing_api_loop.c
diff --git a/src/service/testing/testing_api_traits.c b/src/lib/testing/testing_api_traits.c
index 18faa2d04..18faa2d04 100644
--- a/src/service/testing/testing_api_traits.c
+++ b/src/lib/testing/testing_api_traits.c
diff --git a/src/service/testing/testing_cmds.h b/src/lib/testing/testing_cmds.h
index f4549477e..f4549477e 100644
--- a/src/service/testing/testing_cmds.h
+++ b/src/lib/testing/testing_cmds.h
diff --git a/src/service/testing/topo.sh b/src/lib/testing/topo.sh
index 0046622b6..0046622b6 100755
--- a/src/service/testing/topo.sh
+++ b/src/lib/testing/topo.sh
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 610971725..d25493323 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = \
         statistics \
         arm \
         peerstore \
-        testing \
         nat \
         nat-auto \
         transport \
@@ -32,4 +31,3 @@ SUBDIRS = \
         reclaim \
         messenger \
         rest
-
diff --git a/src/service/core/Makefile.am b/src/service/core/Makefile.am
index 220da838f..95f22c82c 100644
--- a/src/service/core/Makefile.am
+++ b/src/service/core/Makefile.am
@@ -44,7 +44,7 @@ libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -53,9 +53,9 @@ libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
 libgnunetcoretesting_la_SOURCES = \
-  core_api_cmd_connecting_peers.c 
+  core_api_cmd_connecting_peers.c
 libgnunetcoretesting_la_LIBADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
@@ -106,13 +106,13 @@ test_core_api_send_to_self_SOURCES = \
  test_core_api_send_to_self.c
 test_core_api_send_to_self_LDADD = \
  libgnunetcore.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_core_api_start_only_SOURCES = \
  test_core_api_start_only.c
 test_core_api_start_only_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetcore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/service/gns/gns_tld_api.c b/src/service/gns/gns_tld_api.c
index 63b5ac552..7a6864010 100644
--- a/src/service/gns/gns_tld_api.c
+++ b/src/service/gns/gns_tld_api.c
@@ -23,8 +23,8 @@
  * @author Martin Schanzenbach
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
 #include "platform.h"
+#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/service/hostlist/gnunet-daemon-hostlist_server.c b/src/service/hostlist/gnunet-daemon-hostlist_server.c
index f243deb00..7cfeaec63 100644
--- a/src/service/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/service/hostlist/gnunet-daemon-hostlist_server.c
@@ -25,8 +25,8 @@
  * @author David Barksdale
  * @brief application to provide an integrated hostlist HTTP server
  */
-#include "gnunet_common.h"
 #include "platform.h"
+#include "gnunet_common.h"
 #include <microhttpd.h>
 #include "gnunet-daemon-hostlist_server.h"
 #include "gnunet_hello_uri_lib.h"
diff --git a/src/service/meson.build b/src/service/meson.build
index ff874a1ec..2d749bdec 100644
--- a/src/service/meson.build
+++ b/src/service/meson.build
@@ -7,7 +7,6 @@ endif
 subdir('util')
 subdir('statistics')
 subdir('arm')
-subdir('testing')
 subdir('peerstore')
 subdir('nat')
 subdir('nat-auto')
diff --git a/src/service/messenger/Makefile.am b/src/service/messenger/Makefile.am
index 93dcf9a78..876b19985 100644
--- a/src/service/messenger/Makefile.am
+++ b/src/service/messenger/Makefile.am
@@ -62,7 +62,7 @@ libgnunetmessengertesting_la_SOURCES = \
   messenger-testing.c messenger-testing.h
 libgnunetmessengertesting_la_LIBADD = \
   libgnunetmessenger.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
   $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
@@ -90,7 +90,7 @@ libgnunet_test_messenger_plugin_cmd_simple_join_la_LIBADD = \
   $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
   $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/service/transport/libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
@@ -147,14 +147,14 @@ test_messenger_api_SOURCES = \
   test_messenger.c
 test_messenger_api_LDADD = \
   libgnunetmessenger.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_messenger_anonymous_SOURCES = \
   test_messenger_anonymous.c
 test_messenger_anonymous_LDADD = \
   libgnunetmessenger.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/service/rest/reclaim_plugin.c b/src/service/rest/reclaim_plugin.c
index ed86601d1..10b6b7bdc 100644
--- a/src/service/rest/reclaim_plugin.c
+++ b/src/service/rest/reclaim_plugin.c
@@ -24,8 +24,8 @@
  * @brief GNUnet reclaim REST plugin
  *
  */
-#include "gnunet_json_lib.h"
 #include "platform.h"
+#include "gnunet_json_lib.h"
 #include "microhttpd.h"
 #include <inttypes.h>
 #include <jansson.h>
@@ -1231,7 +1231,7 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
   json_error_t err;
   struct GNUNET_JSON_Specification tktspec[] =
   { GNUNET_RECLAIM_JSON_spec_ticket (&ticket),
-    GNUNET_JSON_spec_string("rp_uri", &rp_uri),
+    GNUNET_JSON_spec_string ("rp_uri", &rp_uri),
     GNUNET_JSON_spec_end () };
 
   if (0 >= handle->rest_handle->data_size)
diff --git a/src/service/transport/Makefile.am b/src/service/transport/Makefile.am
index 56ed8fc13..a78371f10 100644
--- a/src/service/transport/Makefile.am
+++ b/src/service/transport/Makefile.am
@@ -49,7 +49,7 @@ libgnunettransporttesting2_la_LIBADD = \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
   $(top_builddir)/src/service/arm/libgnunetarm.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -203,7 +203,7 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -219,7 +219,7 @@ libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -235,7 +235,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -251,7 +251,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -267,7 +267,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -283,7 +283,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -328,7 +328,7 @@ endif
 test_transport_start_with_config_SOURCES = \
  test_transport_start_with_config.c
 test_transport_start_with_config_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/lib/hello/libgnunethello.la \
  libgnunettransportcore.la \
@@ -338,7 +338,7 @@ test_communicator_basic_unix_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_unix_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -346,7 +346,7 @@ test_communicator_basic_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_tcp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -354,7 +354,7 @@ test_communicator_basic_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_udp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -362,7 +362,7 @@ test_communicator_basic_quic_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_quic_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -370,7 +370,7 @@ test_communicator_rekey_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_rekey_tcp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -378,7 +378,7 @@ test_communicator_rekey_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_rekey_udp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -386,7 +386,7 @@ test_communicator_backchannel_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_backchannel_udp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -394,7 +394,7 @@ test_communicator_bidirect_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_bidirect_tcp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la