gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] 04/10: BUILD: Move testing to lib


From: gnunet
Subject: [gnunet] 04/10: BUILD: Move testing to lib
Date: Wed, 18 Oct 2023 15:15:52 +0200

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit cc90a65e1a562889778d748c129bff2920e3dd21
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 14:01:07 2023 +0200

    BUILD: Move testing to lib
---
 configure.ac                                       |  4 +-
 po/POTFILES.in                                     | 44 +++++++--------
 src/Makefile.am                                    |  3 -
 src/cadet/Makefile.am                              |  2 +-
 src/consensus/Makefile.am                          |  2 +-
 src/conversation/Makefile.am                       |  6 +-
 src/core/Makefile.am                               |  8 +--
 src/datacache/Makefile.am                          | 12 ++--
 src/datastore/Makefile.am                          | 30 +++++-----
 src/dht/Makefile.am                                |  2 +-
 src/dhtu/Makefile.am                               |  4 +-
 src/fs/Makefile.am                                 | 32 +++++------
 src/identity/Makefile.am                           |  2 +-
 src/lib/Makefile.am                                |  3 +-
 src/lib/gnsrecord/Makefile.am                      | 10 ++--
 src/{ => lib}/testing/.gitignore                   |  0
 src/{ => lib}/testing/Makefile.am                  |  0
 src/{ => lib}/testing/gnunet-cmds-helper.c         |  0
 src/{ => lib}/testing/gnunet-testing.c             |  0
 src/{ => lib}/testing/list-keys.c                  |  0
 src/{ => lib}/testing/meson.build                  |  0
 src/{ => lib}/testing/test_testing_defaults.conf   |  0
 src/{ => lib}/testing/test_testing_peerstartup.c   |  0
 src/{ => lib}/testing/test_testing_peerstartup2.c  |  0
 .../testing/test_testing_portreservation.c         |  0
 .../testing/test_testing_servicestartup.c          |  0
 .../testing/test_testing_sharedservices.c          |  0
 .../testing/test_testing_sharedservices.conf       |  0
 .../testing/test_testing_start_with_config.c       |  0
 src/{ => lib}/testing/testing.c                    |  0
 src/{ => lib}/testing/testing.conf                 |  0
 src/{ => lib}/testing/testing.h                    |  0
 src/{ => lib}/testing/testing_api_cmd_barrier.c    |  0
 .../testing/testing_api_cmd_barrier_reached.c      |  0
 src/{ => lib}/testing/testing_api_cmd_batch.c      |  0
 .../testing_api_cmd_block_until_external_trigger.c |  0
 .../testing/testing_api_cmd_exec_bash_script.c     |  0
 src/{ => lib}/testing/testing_api_cmd_finish.c     |  0
 .../testing/testing_api_cmd_local_test_prepared.c  |  0
 .../testing/testing_api_cmd_netjail_start.c        |  0
 .../testing_api_cmd_netjail_start_cmds_helper.c    |  0
 .../testing/testing_api_cmd_netjail_stop.c         |  0
 .../testing_api_cmd_netjail_stop_cmds_helper.c     |  0
 .../testing/testing_api_cmd_send_peer_ready.c      |  0
 src/{ => lib}/testing/testing_api_cmd_start_peer.c |  0
 src/{ => lib}/testing/testing_api_cmd_stop_peer.c  |  0
 .../testing/testing_api_cmd_system_create.c        |  0
 .../testing/testing_api_cmd_system_destroy.c       |  0
 src/{ => lib}/testing/testing_api_loop.c           |  0
 src/{ => lib}/testing/testing_api_traits.c         |  0
 src/{ => lib}/testing/testing_cmds.h               |  0
 src/{ => lib}/testing/topo.sh                      |  0
 src/messenger/Makefile.am                          |  4 +-
 src/namecache/Makefile.am                          |  8 +--
 src/namestore/Makefile.am                          | 66 +++++++++++-----------
 src/nse/Makefile.am                                |  4 +-
 src/peerstore/Makefile.am                          | 14 ++---
 src/pt/Makefile.am                                 | 10 ++--
 src/regex/Makefile.am                              |  4 +-
 src/revocation/Makefile.am                         |  2 +-
 src/secretsharing/Makefile.am                      |  4 +-
 src/set/Makefile.am                                | 10 ++--
 src/seti/Makefile.am                               |  4 +-
 src/setu/Makefile.am                               |  6 +-
 src/transport/Makefile.am                          | 32 +++++------
 65 files changed, 165 insertions(+), 167 deletions(-)

diff --git a/configure.ac b/configure.ac
index d27189169..fb2600595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1235,8 +1235,9 @@ src/lib/block/Makefile
 src/lib/curl/Makefile
 src/lib/gnsrecord/Makefile
 src/lib/json/Makefile
-src/lib/sq/Makefile
 src/lib/pq/Makefile
+src/lib/sq/Makefile
+src/lib/testing/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/gnsrecord/Makefile
@@ -1300,7 +1301,6 @@ src/setu/setu.conf
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/template/Makefile
-src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/transport/transport.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 54f8e9cc7..4384d2c02 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -201,6 +201,28 @@ src/lib/sq/sq_exec.c
 src/lib/sq/sq_prepare.c
 src/lib/sq/sq_query_helper.c
 src/lib/sq/sq_result_helper.c
+src/lib/testing/gnunet-cmds-helper.c
+src/lib/testing/gnunet-testing.c
+src/lib/testing/list-keys.c
+src/lib/testing/testing.c
+src/lib/testing/testing_api_cmd_barrier.c
+src/lib/testing/testing_api_cmd_barrier_reached.c
+src/lib/testing/testing_api_cmd_batch.c
+src/lib/testing/testing_api_cmd_block_until_external_trigger.c
+src/lib/testing/testing_api_cmd_exec_bash_script.c
+src/lib/testing/testing_api_cmd_finish.c
+src/lib/testing/testing_api_cmd_local_test_prepared.c
+src/lib/testing/testing_api_cmd_netjail_start.c
+src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
+src/lib/testing/testing_api_cmd_netjail_stop.c
+src/lib/testing/testing_api_cmd_netjail_stop_cmds_helper.c
+src/lib/testing/testing_api_cmd_send_peer_ready.c
+src/lib/testing/testing_api_cmd_start_peer.c
+src/lib/testing/testing_api_cmd_stop_peer.c
+src/lib/testing/testing_api_cmd_system_create.c
+src/lib/testing/testing_api_cmd_system_destroy.c
+src/lib/testing/testing_api_loop.c
+src/lib/testing/testing_api_traits.c
 src/lib/util/bandwidth.c
 src/lib/util/benchmark.c
 src/lib/util/bio.c
@@ -444,28 +466,6 @@ src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
 src/template/gnunet-service-template.c
 src/template/gnunet-template.c
-src/testing/gnunet-cmds-helper.c
-src/testing/gnunet-testing.c
-src/testing/list-keys.c
-src/testing/testing.c
-src/testing/testing_api_cmd_barrier.c
-src/testing/testing_api_cmd_barrier_reached.c
-src/testing/testing_api_cmd_batch.c
-src/testing/testing_api_cmd_block_until_external_trigger.c
-src/testing/testing_api_cmd_exec_bash_script.c
-src/testing/testing_api_cmd_finish.c
-src/testing/testing_api_cmd_local_test_prepared.c
-src/testing/testing_api_cmd_netjail_start.c
-src/testing/testing_api_cmd_netjail_start_cmds_helper.c
-src/testing/testing_api_cmd_netjail_stop.c
-src/testing/testing_api_cmd_netjail_stop_cmds_helper.c
-src/testing/testing_api_cmd_send_peer_ready.c
-src/testing/testing_api_cmd_start_peer.c
-src/testing/testing_api_cmd_stop_peer.c
-src/testing/testing_api_cmd_system_create.c
-src/testing/testing_api_cmd_system_destroy.c
-src/testing/testing_api_loop.c
-src/testing/testing_api_traits.c
 src/topology/gnunet-daemon-topology.c
 src/transport/gnunet-communicator-quic.c
 src/transport/gnunet-communicator-tcp.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 317caef67..41180c509 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 # This Makefile.am is in the public domain
 
-TESTING = testing
-
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
   rps \
@@ -29,7 +27,6 @@ SUBDIRS = \
        cli \
   statistics \
   arm \
-  $(TESTING) \
   $(REST_DIR) \
   datacache \
   datastore \
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index b28286197..1b56df350 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -79,7 +79,7 @@ test_cadet_local_mq_SOURCES = \
   test_cadet_local_mq.c
 test_cadet_local_mq_LDADD = \
   libgnunetcadet.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 if ENABLE_TEST_RUN
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index a88b8bc60..da075748b 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -92,7 +92,7 @@ test_consensus_api_SOURCES = \
  test_consensus_api.c
 test_consensus_api_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetconsensus.la
 
 noinst_SCRIPTS = \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 0b8a34d36..744280af0 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -225,7 +225,7 @@ test_conversation_api_LDADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 test_conversation_api_LDFLAGS = \
   -export-dynamic
@@ -239,7 +239,7 @@ test_conversation_api_twocalls_LDADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 test_conversation_api_twocalls_LDFLAGS = \
   -export-dynamic
@@ -253,7 +253,7 @@ test_conversation_api_reject_LDADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 test_conversation_api_reject_LDFLAGS = \
   -export-dynamic
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 7a9046c57..4a8ee9b31 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -41,7 +41,7 @@ libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
   libgnunetcoretesting.la \
   $(top_builddir)/src/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/transport/libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -54,7 +54,7 @@ libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
 libgnunetcoretesting_la_SOURCES = \
   core_api_cmd_connecting_peers.c 
 libgnunetcoretesting_la_LIBADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/transport/libgnunettransportcore.la \
@@ -113,13 +113,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/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/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetcore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index fd5d28d89..16359945a 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -124,42 +124,42 @@ endif
 test_datacache_sqlite_SOURCES = \
  test_datacache.c
 test_datacache_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_quota_sqlite_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_heap_SOURCES = \
  test_datacache.c
 test_datacache_heap_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_quota_heap_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_heap_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_postgres_SOURCES = \
  test_datacache.c
 test_datacache_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_quota_postgres_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index cecce6d58..fc7b71bcc 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -151,102 +151,102 @@ endif
 test_datastore_api_heap_SOURCES = \
  test_datastore_api.c
 test_datastore_api_heap_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datastore_api_management_heap_SOURCES = \
  test_datastore_api_management.c
 test_datastore_api_management_heap_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_datastore_api_heap_SOURCES = \
  perf_datastore_api.c
 perf_datastore_api_heap_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_plugin_datastore_heap_SOURCES = \
  perf_plugin_datastore.c
 perf_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_datastore_heap_SOURCES = \
  test_plugin_datastore.c
 test_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 
 test_datastore_api_sqlite_SOURCES = \
  test_datastore_api.c
 test_datastore_api_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datastore_api_management_sqlite_SOURCES = \
  test_datastore_api_management.c
 test_datastore_api_management_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_datastore_api_sqlite_SOURCES = \
  perf_datastore_api.c
 perf_datastore_api_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_plugin_datastore_sqlite_SOURCES = \
  perf_plugin_datastore.c
 perf_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_datastore_sqlite_SOURCES = \
  test_plugin_datastore.c
 test_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 
 test_datastore_api_postgres_SOURCES = \
  test_datastore_api.c
 test_datastore_api_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datastore_api_management_postgres_SOURCES = \
  test_datastore_api_management.c
 test_datastore_api_management_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_datastore_api_postgres_SOURCES = \
  perf_datastore_api.c
 perf_datastore_api_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_datastore_postgres_SOURCES = \
  test_plugin_datastore.c
 test_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_plugin_datastore_postgres_SOURCES = \
  perf_plugin_datastore.c
 perf_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 1e3a5f8f8..dfc0d2bbf 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -113,7 +113,7 @@ test_dht_api_SOURCES = \
  test_dht_api.c
 test_dht_api_LDADD = \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/hello/libgnunethello.la \
  libgnunetdht.la
 
diff --git a/src/dhtu/Makefile.am b/src/dhtu/Makefile.am
index a22a72c89..cfe2a014f 100644
--- a/src/dhtu/Makefile.am
+++ b/src/dhtu/Makefile.am
@@ -51,7 +51,7 @@ lib_LTLIBRARIES = \
 libgnunettestingdhtu_la_SOURCES = \
   testing_dhtu_cmd_send.c
 libgnunettestingdhtu_la_LIBADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/arm/libgnunetarm.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(LTLIBINTL)
@@ -64,7 +64,7 @@ libgnunettestingdhtu_la_LDFLAGS = \
 test_dhtu_ip_SOURCES = \
  test_dhtu_ip.c
 test_dhtu_ip_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/arm/libgnunetarm.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 573063301..b8b62c7ea 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -278,28 +278,28 @@ endif
 test_fs_download_SOURCES = \
  test_fs_download.c
 test_fs_download_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_download_indexed_SOURCES = \
  test_fs_download.c
 test_fs_download_indexed_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_download_cadet_SOURCES = \
  test_fs_download.c
 test_fs_download_cadet_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_download_persistence_SOURCES = \
  test_fs_download_persistence.c
 test_fs_download_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -324,84 +324,84 @@ test_fs_getopt_LDADD = \
 test_fs_list_indexed_SOURCES = \
  test_fs_list_indexed.c
 test_fs_list_indexed_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_namespace_SOURCES = \
  test_fs_namespace.c
 test_fs_namespace_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_namespace_list_updateable_SOURCES = \
  test_fs_namespace_list_updateable.c
 test_fs_namespace_list_updateable_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_publish_SOURCES = \
  test_fs_publish.c
 test_fs_publish_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_publish_persistence_SOURCES = \
  test_fs_publish_persistence.c
 test_fs_publish_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_SOURCES = \
  test_fs_search.c
 test_fs_search_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la       \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_with_and_SOURCES = \
  test_fs_search_with_and.c
 test_fs_search_with_and_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la       \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_probes_SOURCES = \
  test_fs_search_probes.c
 test_fs_search_probes_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la       \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_persistence_SOURCES = \
  test_fs_search_persistence.c
 test_fs_search_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la       \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_start_stop_SOURCES = \
  test_fs_start_stop.c
 test_fs_start_stop_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_unindex_SOURCES = \
  test_fs_unindex.c
 test_fs_unindex_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_unindex_persistence_SOURCES = \
  test_fs_unindex_persistence.c
 test_fs_unindex_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index bd9712da3..bf430ed77 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -85,7 +85,7 @@ test_identity_SOURCES = \
  test_identity.c
 test_identity_LDADD = \
   libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c9871d8c7..8ab0d6993 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -10,4 +10,5 @@ SUBDIRS = \
        curl \
        json \
        sq \
-       $(POSTGRES_DIR)
+       $(POSTGRES_DIR) \
+       testing
diff --git a/src/lib/gnsrecord/Makefile.am b/src/lib/gnsrecord/Makefile.am
index 9872ff74b..27d14a972 100644
--- a/src/lib/gnsrecord/Makefile.am
+++ b/src/lib/gnsrecord/Makefile.am
@@ -74,7 +74,7 @@ EXTRA_DIST = \
 test_gnsrecord_lsd0001testvectors_SOURCES = \
  test_gnsrecord_testvectors.c
 test_gnsrecord_lsd0001testvectors_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -82,14 +82,14 @@ test_gnsrecord_lsd0001testvectors_LDADD = \
 test_gnsrecord_serialization_SOURCES = \
  test_gnsrecord_serialization.c
 test_gnsrecord_serialization_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_gnsrecord_block_expiration_SOURCES = \
  test_gnsrecord_block_expiration.c
 test_gnsrecord_block_expiration_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -97,7 +97,7 @@ test_gnsrecord_block_expiration_LDADD = \
 test_gnsrecord_crypto_SOURCES = \
  test_gnsrecord_crypto.c
 test_gnsrecord_crypto_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -105,6 +105,6 @@ test_gnsrecord_crypto_LDADD = \
 perf_gnsrecord_crypto_SOURCES = \
  perf_gnsrecord_crypto.c
 perf_gnsrecord_crypto_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/testing/.gitignore b/src/lib/testing/.gitignore
similarity index 100%
rename from src/testing/.gitignore
rename to src/lib/testing/.gitignore
diff --git a/src/testing/Makefile.am b/src/lib/testing/Makefile.am
similarity index 100%
rename from src/testing/Makefile.am
rename to src/lib/testing/Makefile.am
diff --git a/src/testing/gnunet-cmds-helper.c 
b/src/lib/testing/gnunet-cmds-helper.c
similarity index 100%
rename from src/testing/gnunet-cmds-helper.c
rename to src/lib/testing/gnunet-cmds-helper.c
diff --git a/src/testing/gnunet-testing.c b/src/lib/testing/gnunet-testing.c
similarity index 100%
rename from src/testing/gnunet-testing.c
rename to src/lib/testing/gnunet-testing.c
diff --git a/src/testing/list-keys.c b/src/lib/testing/list-keys.c
similarity index 100%
rename from src/testing/list-keys.c
rename to src/lib/testing/list-keys.c
diff --git a/src/testing/meson.build b/src/lib/testing/meson.build
similarity index 100%
rename from src/testing/meson.build
rename to src/lib/testing/meson.build
diff --git a/src/testing/test_testing_defaults.conf 
b/src/lib/testing/test_testing_defaults.conf
similarity index 100%
rename from src/testing/test_testing_defaults.conf
rename to src/lib/testing/test_testing_defaults.conf
diff --git a/src/testing/test_testing_peerstartup.c 
b/src/lib/testing/test_testing_peerstartup.c
similarity index 100%
rename from src/testing/test_testing_peerstartup.c
rename to src/lib/testing/test_testing_peerstartup.c
diff --git a/src/testing/test_testing_peerstartup2.c 
b/src/lib/testing/test_testing_peerstartup2.c
similarity index 100%
rename from src/testing/test_testing_peerstartup2.c
rename to src/lib/testing/test_testing_peerstartup2.c
diff --git a/src/testing/test_testing_portreservation.c 
b/src/lib/testing/test_testing_portreservation.c
similarity index 100%
rename from src/testing/test_testing_portreservation.c
rename to src/lib/testing/test_testing_portreservation.c
diff --git a/src/testing/test_testing_servicestartup.c 
b/src/lib/testing/test_testing_servicestartup.c
similarity index 100%
rename from src/testing/test_testing_servicestartup.c
rename to src/lib/testing/test_testing_servicestartup.c
diff --git a/src/testing/test_testing_sharedservices.c 
b/src/lib/testing/test_testing_sharedservices.c
similarity index 100%
rename from src/testing/test_testing_sharedservices.c
rename to src/lib/testing/test_testing_sharedservices.c
diff --git a/src/testing/test_testing_sharedservices.conf 
b/src/lib/testing/test_testing_sharedservices.conf
similarity index 100%
rename from src/testing/test_testing_sharedservices.conf
rename to src/lib/testing/test_testing_sharedservices.conf
diff --git a/src/testing/test_testing_start_with_config.c 
b/src/lib/testing/test_testing_start_with_config.c
similarity index 100%
rename from src/testing/test_testing_start_with_config.c
rename to src/lib/testing/test_testing_start_with_config.c
diff --git a/src/testing/testing.c b/src/lib/testing/testing.c
similarity index 100%
rename from src/testing/testing.c
rename to src/lib/testing/testing.c
diff --git a/src/testing/testing.conf b/src/lib/testing/testing.conf
similarity index 100%
rename from src/testing/testing.conf
rename to src/lib/testing/testing.conf
diff --git a/src/testing/testing.h b/src/lib/testing/testing.h
similarity index 100%
rename from src/testing/testing.h
rename to src/lib/testing/testing.h
diff --git a/src/testing/testing_api_cmd_barrier.c 
b/src/lib/testing/testing_api_cmd_barrier.c
similarity index 100%
rename from src/testing/testing_api_cmd_barrier.c
rename to src/lib/testing/testing_api_cmd_barrier.c
diff --git a/src/testing/testing_api_cmd_barrier_reached.c 
b/src/lib/testing/testing_api_cmd_barrier_reached.c
similarity index 100%
rename from src/testing/testing_api_cmd_barrier_reached.c
rename to src/lib/testing/testing_api_cmd_barrier_reached.c
diff --git a/src/testing/testing_api_cmd_batch.c 
b/src/lib/testing/testing_api_cmd_batch.c
similarity index 100%
rename from src/testing/testing_api_cmd_batch.c
rename to src/lib/testing/testing_api_cmd_batch.c
diff --git a/src/testing/testing_api_cmd_block_until_external_trigger.c 
b/src/lib/testing/testing_api_cmd_block_until_external_trigger.c
similarity index 100%
rename from src/testing/testing_api_cmd_block_until_external_trigger.c
rename to src/lib/testing/testing_api_cmd_block_until_external_trigger.c
diff --git a/src/testing/testing_api_cmd_exec_bash_script.c 
b/src/lib/testing/testing_api_cmd_exec_bash_script.c
similarity index 100%
rename from src/testing/testing_api_cmd_exec_bash_script.c
rename to src/lib/testing/testing_api_cmd_exec_bash_script.c
diff --git a/src/testing/testing_api_cmd_finish.c 
b/src/lib/testing/testing_api_cmd_finish.c
similarity index 100%
rename from src/testing/testing_api_cmd_finish.c
rename to src/lib/testing/testing_api_cmd_finish.c
diff --git a/src/testing/testing_api_cmd_local_test_prepared.c 
b/src/lib/testing/testing_api_cmd_local_test_prepared.c
similarity index 100%
rename from src/testing/testing_api_cmd_local_test_prepared.c
rename to src/lib/testing/testing_api_cmd_local_test_prepared.c
diff --git a/src/testing/testing_api_cmd_netjail_start.c 
b/src/lib/testing/testing_api_cmd_netjail_start.c
similarity index 100%
rename from src/testing/testing_api_cmd_netjail_start.c
rename to src/lib/testing/testing_api_cmd_netjail_start.c
diff --git a/src/testing/testing_api_cmd_netjail_start_cmds_helper.c 
b/src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
similarity index 100%
rename from src/testing/testing_api_cmd_netjail_start_cmds_helper.c
rename to src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
diff --git a/src/testing/testing_api_cmd_netjail_stop.c 
b/src/lib/testing/testing_api_cmd_netjail_stop.c
similarity index 100%
rename from src/testing/testing_api_cmd_netjail_stop.c
rename to src/lib/testing/testing_api_cmd_netjail_stop.c
diff --git a/src/testing/testing_api_cmd_netjail_stop_cmds_helper.c 
b/src/lib/testing/testing_api_cmd_netjail_stop_cmds_helper.c
similarity index 100%
rename from src/testing/testing_api_cmd_netjail_stop_cmds_helper.c
rename to src/lib/testing/testing_api_cmd_netjail_stop_cmds_helper.c
diff --git a/src/testing/testing_api_cmd_send_peer_ready.c 
b/src/lib/testing/testing_api_cmd_send_peer_ready.c
similarity index 100%
rename from src/testing/testing_api_cmd_send_peer_ready.c
rename to src/lib/testing/testing_api_cmd_send_peer_ready.c
diff --git a/src/testing/testing_api_cmd_start_peer.c 
b/src/lib/testing/testing_api_cmd_start_peer.c
similarity index 100%
rename from src/testing/testing_api_cmd_start_peer.c
rename to src/lib/testing/testing_api_cmd_start_peer.c
diff --git a/src/testing/testing_api_cmd_stop_peer.c 
b/src/lib/testing/testing_api_cmd_stop_peer.c
similarity index 100%
rename from src/testing/testing_api_cmd_stop_peer.c
rename to src/lib/testing/testing_api_cmd_stop_peer.c
diff --git a/src/testing/testing_api_cmd_system_create.c 
b/src/lib/testing/testing_api_cmd_system_create.c
similarity index 100%
rename from src/testing/testing_api_cmd_system_create.c
rename to src/lib/testing/testing_api_cmd_system_create.c
diff --git a/src/testing/testing_api_cmd_system_destroy.c 
b/src/lib/testing/testing_api_cmd_system_destroy.c
similarity index 100%
rename from src/testing/testing_api_cmd_system_destroy.c
rename to src/lib/testing/testing_api_cmd_system_destroy.c
diff --git a/src/testing/testing_api_loop.c b/src/lib/testing/testing_api_loop.c
similarity index 100%
rename from src/testing/testing_api_loop.c
rename to src/lib/testing/testing_api_loop.c
diff --git a/src/testing/testing_api_traits.c 
b/src/lib/testing/testing_api_traits.c
similarity index 100%
rename from src/testing/testing_api_traits.c
rename to src/lib/testing/testing_api_traits.c
diff --git a/src/testing/testing_cmds.h b/src/lib/testing/testing_cmds.h
similarity index 100%
rename from src/testing/testing_cmds.h
rename to src/lib/testing/testing_cmds.h
diff --git a/src/testing/topo.sh b/src/lib/testing/topo.sh
similarity index 100%
rename from src/testing/topo.sh
rename to src/lib/testing/topo.sh
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
index 1af950b01..a1228a7a1 100644
--- a/src/messenger/Makefile.am
+++ b/src/messenger/Makefile.am
@@ -109,14 +109,14 @@ test_messenger_api_SOURCES = \
   test_messenger.c
 test_messenger_api_LDADD = \
   libgnunetmessenger.la \
-  $(top_builddir)/src/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/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 3c0a70252..b4a0d68f5 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -149,26 +149,26 @@ test_namecache_api_cache_block_LDADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamecache.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 
 test_plugin_namecache_flat_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_flat_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_namecache_sqlite_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_namecache_postgres_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 39a75772e..c9833add5 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -223,7 +223,7 @@ libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
 test_namestore_api_store_sqlite_SOURCES = \
  test_namestore_api_store.c
 test_namestore_api_store_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
@@ -232,7 +232,7 @@ test_namestore_api_store_sqlite_LDADD = \
 test_namestore_api_store_postgres_SOURCES = \
  test_namestore_api_store.c
 test_namestore_api_store_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
@@ -241,7 +241,7 @@ test_namestore_api_store_postgres_LDADD = \
 test_namestore_api_store_update_sqlite_SOURCES = \
  test_namestore_api_store_update.c
 test_namestore_api_store_update_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -251,7 +251,7 @@ test_namestore_api_store_update_sqlite_LDADD = \
 test_namestore_api_store_update_postgres_SOURCES = \
  test_namestore_api_store_update.c
 test_namestore_api_store_update_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -261,7 +261,7 @@ test_namestore_api_store_update_postgres_LDADD = \
 test_namestore_api_lookup_nick_sqlite_SOURCES = \
  test_namestore_api_lookup_nick.c
 test_namestore_api_lookup_nick_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -271,7 +271,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \
 test_namestore_api_lookup_nick_postgres_SOURCES = \
  test_namestore_api_lookup_nick.c
 test_namestore_api_lookup_nick_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -282,7 +282,7 @@ test_namestore_api_remove_sqlite_SOURCES = \
  test_namestore_api_remove.c
 test_namestore_api_remove_sqlite_LDADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   libgnunetnamestore.la
@@ -291,7 +291,7 @@ test_namestore_api_remove_postgres_SOURCES = \
  test_namestore_api_remove.c
 test_namestore_api_remove_postgres_LDADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   libgnunetnamestore.la
@@ -299,7 +299,7 @@ test_namestore_api_remove_postgres_LDADD = \
 test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
 test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -308,7 +308,7 @@ test_namestore_api_remove_not_existing_record_sqlite_LDADD 
= \
 test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
 test_namestore_api_remove_not_existing_record_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -318,7 +318,7 @@ test_namestore_api_zone_to_name_sqlite_SOURCES = \
  test_namestore_api_zone_to_name.c
 test_namestore_api_zone_to_name_sqlite_LDADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   libgnunetnamestore.la
 
@@ -326,7 +326,7 @@ test_namestore_api_zone_to_name_postgres_SOURCES = \
  test_namestore_api_zone_to_name.c
 test_namestore_api_zone_to_name_postgres_LDADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   libgnunetnamestore.la
 
@@ -334,7 +334,7 @@ test_namestore_api_monitoring_sqlite_SOURCES = \
  test_namestore_api_monitoring.c
 test_namestore_api_monitoring_sqlite_LDADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -342,7 +342,7 @@ test_namestore_api_monitoring_sqlite_LDADD = \
 test_namestore_api_monitoring_postgres_SOURCES = \
  test_namestore_api_monitoring.c
 test_namestore_api_monitoring_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -351,7 +351,7 @@ test_namestore_api_monitoring_postgres_LDADD = \
 test_namestore_api_monitoring_existing_sqlite_SOURCES = \
  test_namestore_api_monitoring_existing.c
 test_namestore_api_monitoring_existing_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -360,7 +360,7 @@ test_namestore_api_monitoring_existing_sqlite_LDADD = \
 test_namestore_api_monitoring_existing_postgres_SOURCES = \
  test_namestore_api_monitoring_existing.c
 test_namestore_api_monitoring_existing_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
@@ -369,7 +369,7 @@ test_namestore_api_monitoring_existing_postgres_LDADD = \
 test_namestore_api_tx_rollback_sqlite_SOURCES = \
  test_namestore_api_tx_rollback.c
 test_namestore_api_tx_rollback_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -378,7 +378,7 @@ test_namestore_api_tx_rollback_sqlite_LDADD = \
 test_namestore_api_tx_rollback_postgres_SOURCES = \
  test_namestore_api_tx_rollback.c
 test_namestore_api_tx_rollback_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -388,7 +388,7 @@ if HAVE_EXPERIMENTAL
 test_namestore_api_edit_records_postgres_SOURCES = \
  test_namestore_api_edit_records.c
 test_namestore_api_edit_records_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -398,7 +398,7 @@ endif
 test_namestore_api_zone_iteration_sqlite_SOURCES = \
  test_namestore_api_zone_iteration.c
 test_namestore_api_zone_iteration_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -407,7 +407,7 @@ test_namestore_api_zone_iteration_sqlite_LDADD = \
 test_namestore_api_zone_iteration_postgres_SOURCES = \
  test_namestore_api_zone_iteration.c
 test_namestore_api_zone_iteration_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -416,7 +416,7 @@ test_namestore_api_zone_iteration_postgres_LDADD = \
 perf_namestore_api_zone_iteration_postgres_SOURCES = \
  perf_namestore_api_zone_iteration.c
 perf_namestore_api_zone_iteration_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -425,7 +425,7 @@ perf_namestore_api_zone_iteration_postgres_LDADD = \
 perf_namestore_api_import_sqlite_SOURCES = \
  perf_namestore_api_import.c
 perf_namestore_api_import_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -434,7 +434,7 @@ perf_namestore_api_import_sqlite_LDADD = \
 perf_namestore_api_import_postgres_SOURCES = \
  perf_namestore_api_import.c
 perf_namestore_api_import_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -444,7 +444,7 @@ perf_namestore_api_import_postgres_LDADD = \
 perf_namestore_api_zone_iteration_sqlite_SOURCES = \
  perf_namestore_api_zone_iteration.c
 perf_namestore_api_zone_iteration_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -453,7 +453,7 @@ perf_namestore_api_zone_iteration_sqlite_LDADD = \
 test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
 test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -462,7 +462,7 @@ test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
 test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
 test_namestore_api_zone_iteration_nick_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -471,7 +471,7 @@ test_namestore_api_zone_iteration_nick_postgres_LDADD = \
 test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_specific_zone.c
 test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -480,7 +480,7 @@ 
test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
 test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
  test_namestore_api_zone_iteration_specific_zone.c
 test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -489,7 +489,7 @@ 
test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
 test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
 test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -498,7 +498,7 @@ test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
 test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
 test_namestore_api_zone_iteration_stop_postgres_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -507,7 +507,7 @@ test_namestore_api_zone_iteration_stop_postgres_LDADD = \
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c
 test_plugin_namestore_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -515,7 +515,7 @@ test_plugin_namestore_postgres_SOURCES = \
   test_plugin_namestore.c
 test_plugin_namestore_postgres_LDADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 check_SCRIPTS = \
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index a6f2b8b36..d028ba19d 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -46,7 +46,7 @@ libexec_PROGRAMS = \
 #  libgnunetnse.la \
 #  $(top_builddir)/src/lib/util/libgnunetutil.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
+#  $(top_builddir)/src/lib/testing/libgnunettesting.la \
 #  $(top_builddir)/src/testbed/libgnunettestbed.la \
 #  $(GN_LIBINTL)
 
@@ -84,7 +84,7 @@ test_nse_api_SOURCES = \
  test_nse_api.c
 test_nse_api_LDADD = \
   libgnunetnse.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_nse_multipeer_SOURCES = \
diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index 6f62c0e71..41a082f89 100644
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -86,13 +86,13 @@ plugin_LTLIBRARIES = \
 test_plugin_peerstore_sqlite_SOURCES = \
   test_plugin_peerstore.c
 test_plugin_peerstore_sqlite_LDADD = \
-       $(top_builddir)/src/testing/libgnunettesting.la \
+       $(top_builddir)/src/lib/testing/libgnunettesting.la \
        $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_peerstore_flat_SOURCES = \
   test_plugin_peerstore.c
 test_plugin_peerstore_flat_LDADD = \
-       $(top_builddir)/src/testing/libgnunettesting.la \
+       $(top_builddir)/src/lib/testing/libgnunettesting.la \
        $(top_builddir)/src/lib/util/libgnunetutil.la
 
 check_PROGRAMS = \
@@ -118,33 +118,33 @@ test_peerstore_api_store_SOURCES = \
  test_peerstore_api_store.c
 test_peerstore_api_store_LDADD = \
   libgnunetpeerstore.la  \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_peerstore_api_iterate_SOURCES = \
  test_peerstore_api_iterate.c
 test_peerstore_api_iterate_LDADD = \
   libgnunetpeerstore.la  \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_peerstore_api_watch_SOURCES = \
  test_peerstore_api_watch.c
 test_peerstore_api_watch_LDADD = \
   libgnunetpeerstore.la  \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_peerstore_api_sync_SOURCES = \
  test_peerstore_api_sync.c
 test_peerstore_api_sync_LDADD = \
   libgnunetpeerstore.la  \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_peerstore_store_SOURCES = \
  perf_peerstore_store.c
 perf_peerstore_store_LDADD = \
   libgnunetpeerstore.la  \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index c2d2ae505..80772fc1b 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -56,7 +56,7 @@ test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/identity/libgnunetidentity.la \
  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -64,7 +64,7 @@ test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -72,7 +72,7 @@ test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -80,7 +80,7 @@ test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -88,6 +88,6 @@ test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index cd96f2508..69f341259 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -141,14 +141,14 @@ test_regex_integration_SOURCES = \
   test_regex_integration.c
 test_regex_integration_LDADD = -lm \
   libgnunetregex.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_regex_api_SOURCES = \
   test_regex_api.c
 test_regex_api_LDADD = -lm \
   libgnunetregex.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_regex_iterate_api_SOURCES = \
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 8afb58a80..38d14f65e 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -53,7 +53,7 @@ gnunet_revocation_tvg_LDADD = \
 test_revocation_lsd0001testvectors_SOURCES = \
  test_revocation_testvectors.c
 test_revocation_lsd0001testvectors_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
        $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetrevocation.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 30b3f8057..6879ef609 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -28,7 +28,7 @@ lib_LTLIBRARIES = \
 # gnunet-secretsharing-profiler.c
 #gnunet_secretsharing_profiler_LDADD = \
 #  libgnunetsecretsharing.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
+#  $(top_builddir)/src/lib/testing/libgnunettesting.la \
 #  $(top_builddir)/src/testbed/libgnunettestbed.la \
 #  $(top_builddir)/src/lib/util/libgnunetutil.la \
 #  $(GN_LIBINTL)
@@ -67,7 +67,7 @@ test_secretsharing_api_SOURCES = \
  test_secretsharing_api.c
 test_secretsharing_api_LDADD = \
   libgnunetsecretsharing.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 7433226a3..cd65b66e6 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -30,7 +30,7 @@ gnunet_set_profiler_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   libgnunetset.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(GN_LIBINTL)
 
 
@@ -80,28 +80,28 @@ test_set_api_SOURCES = \
  test_set_api.c
 test_set_api_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetset.la
 
 test_set_union_result_symmetric_SOURCES = \
  test_set_union_result_symmetric.c
 test_set_union_result_symmetric_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetset.la
 
 test_set_intersection_result_full_SOURCES = \
  test_set_intersection_result_full.c
 test_set_intersection_result_full_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetset.la
 
 test_set_union_copy_SOURCES = \
  test_set_union_copy.c
 test_set_union_copy_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetset.la
 
 plugin_LTLIBRARIES = \
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am
index 6292dce0a..681cde703 100644
--- a/src/seti/Makefile.am
+++ b/src/seti/Makefile.am
@@ -29,7 +29,7 @@ gnunet_seti_profiler_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   libgnunetseti.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(GN_LIBINTL)
 
 
@@ -65,7 +65,7 @@ test_seti_api_SOURCES = \
  test_seti_api.c
 test_seti_api_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetseti.la
 
 plugin_LTLIBRARIES = \
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am
index 32ccc7b26..c2a87f7a9 100644
--- a/src/setu/Makefile.am
+++ b/src/setu/Makefile.am
@@ -30,7 +30,7 @@ gnunet_setu_profiler_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   libgnunetsetu.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(GN_LIBINTL)
 
 
@@ -76,7 +76,7 @@ test_setu_api_SOURCES = \
  test_setu_api.c
 test_setu_api_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetsetu.la
 
 
@@ -84,7 +84,7 @@ perf_setu_api_SOURCES = \
  perf_setu_api.c
 perf_setu_api_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetsetu.la
 
 
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 0828f7c04..65326d99d 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -47,7 +47,7 @@ libgnunettransporttesting2_la_LIBADD = \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
   $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -200,7 +200,7 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -216,7 +216,7 @@ 
libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -232,7 +232,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = 
\
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -248,7 +248,7 @@ 
libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -264,7 +264,7 @@ 
libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -280,7 +280,7 @@ 
libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -330,7 +330,7 @@ endif
 test_transport_start_with_config_SOURCES = \
  test_transport_start_with_config.c
 test_transport_start_with_config_LDADD = \
- $(top_builddir)/src/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 \
@@ -340,7 +340,7 @@ test_communicator_basic_unix_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_unix_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -348,7 +348,7 @@ test_communicator_basic_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_tcp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -356,7 +356,7 @@ test_communicator_basic_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_udp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -364,7 +364,7 @@ test_communicator_basic_quic_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_quic_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -372,7 +372,7 @@ test_communicator_rekey_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_rekey_tcp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -380,7 +380,7 @@ test_communicator_rekey_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_rekey_udp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -388,7 +388,7 @@ test_communicator_backchannel_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_backchannel_udp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -396,7 +396,7 @@ test_communicator_bidirect_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_bidirect_tcp_LDADD = \
  libgnunettransporttesting2.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]