22 files changed, 2 insertions, 12 deletions

diff --git a/src/cli/gns/Makefile.am b/src/cli/gns/Makefile.am
index 90875df2d..4fcd91065 100644
--- a/src/cli/gns/Makefile.am
+++ b/src/cli/gns/Makefile.am
@@ -74,7 +74,6 @@ check_SCRIPTS = \
 EXTRA_DIST = \
   test_gns_defaults.conf \
   test_gns_lookup.conf \
-  test_gns_proxy.conf \
   test_gns_simple_lookup.conf \
   openssl.cnf \
   gnunet-gns-proxy-setup-ca.in \
@@ -98,7 +97,6 @@ EXTRA_DIST = \
   test_gns_soa_lookup.sh\
   test_gns_revocation.sh\
   test_gns_redirect_lookup.sh\
-  test_proxy.sh\
         $(pkgdata_DATA) \
   test_gnunet_gns.sh.in
 
diff --git a/src/cli/gns/meson.build b/src/cli/gns/meson.build
index 57f4f3c5f..4374b8413 100644
--- a/src/cli/gns/meson.build
+++ b/src/cli/gns/meson.build
@@ -46,7 +46,6 @@ testconfigs = [
   'test_gns_lookup.conf',
   'test_gns_lookup_peer1.conf',
   'test_gns_lookup_peer2.conf',
-  'test_gns_proxy.conf',
   'test_gns_simple_lookup.conf'
 ]
 
diff --git a/src/service/gns/openssl.cnf b/src/cli/gns/openssl.cnf
index a2561b9b2..a2561b9b2 100644
--- a/src/service/gns/openssl.cnf
+++ b/src/cli/gns/openssl.cnf
diff --git a/src/service/gns/test_gnunet_gns.sh.in b/src/cli/gns/test_gnunet_gns.sh.in
index d0c07b4e4..d0c07b4e4 100755
--- a/src/service/gns/test_gnunet_gns.sh.in
+++ b/src/cli/gns/test_gnunet_gns.sh.in
diff --git a/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey b/src/cli/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
index 895946037..895946037 100644
--- a/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
+++ b/src/cli/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
diff --git a/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey b/src/cli/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
index 3ef49f0ac..3ef49f0ac 100644
--- a/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
+++ b/src/cli/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
diff --git a/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey b/src/cli/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
index 89e0b3a0a..89e0b3a0a 100644
--- a/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
+++ b/src/cli/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
diff --git a/src/service/gns/zonefiles/test_zonekey b/src/cli/gns/zonefiles/test_zonekey
index 870c56315..870c56315 100644
--- a/src/service/gns/zonefiles/test_zonekey
+++ b/src/cli/gns/zonefiles/test_zonekey
diff --git a/src/cli/namestore/Makefile.am b/src/cli/namestore/Makefile.am
index 86ab2f0f7..b666c8851 100644
--- a/src/cli/namestore/Makefile.am
+++ b/src/cli/namestore/Makefile.am
@@ -66,6 +66,5 @@ check_SCRIPTS = \
   test_namestore_zonefile_import.sh
 
 EXTRA_DIST = \
-  test_hostkey \
   example_zonefile \
   $(check_SCRIPTS)
diff --git a/src/cli/revocation/Makefile.am b/src/cli/revocation/Makefile.am
index e4d6a6f35..6bd4919f9 100644
--- a/src/cli/revocation/Makefile.am
+++ b/src/cli/revocation/Makefile.am
@@ -48,5 +48,4 @@ test_local_revocation.py: test_local_revocation.py.in Makefile
         $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_local_revocation.py.in > test_local_revocation.py
         chmod +x test_local_revocation.py
 
-EXTRA_DIST = test_revocation.conf \
-        test_local_revocation.py.in
+EXTRA_DIST = test_local_revocation.py.in
diff --git a/src/service/fs/test_plugin_block_fs.c b/src/plugin/fs/test_plugin_block_fs.c
index f15d10b17..f15d10b17 100644
--- a/src/service/fs/test_plugin_block_fs.c
+++ b/src/plugin/fs/test_plugin_block_fs.c
diff --git a/src/plugin/namecache/Makefile.am b/src/plugin/namecache/Makefile.am
index ac2e2592b..0ccbf9ea1 100644
--- a/src/plugin/namecache/Makefile.am
+++ b/src/plugin/namecache/Makefile.am
@@ -34,10 +34,6 @@ POSTGRES_PLUGIN = libgnunet_plugin_namecache_postgres.la
 POSTGRES_TESTS = test_plugin_namecache_postgres
 endif
 
-# testcases do not even build yet; thus: experimental!
-TESTING_TESTS = \
- test_namecache_api_cache_block
-
 if HAVE_SQLITE
 check_PROGRAMS = \
  $(SQLITE_TESTS) \
diff --git a/src/service/namecache/test_plugin_namecache.c b/src/plugin/namecache/test_plugin_namecache.c
index 141698a23..141698a23 100644
--- a/src/service/namecache/test_plugin_namecache.c
+++ b/src/plugin/namecache/test_plugin_namecache.c
diff --git a/src/service/namecache/test_plugin_namecache_flat.conf b/src/plugin/namecache/test_plugin_namecache_flat.conf
index efe77e37a..efe77e37a 100644
--- a/src/service/namecache/test_plugin_namecache_flat.conf
+++ b/src/plugin/namecache/test_plugin_namecache_flat.conf
diff --git a/src/service/namecache/test_plugin_namecache_postgres.conf b/src/plugin/namecache/test_plugin_namecache_postgres.conf
index 8473857d5..8473857d5 100644
--- a/src/service/namecache/test_plugin_namecache_postgres.conf
+++ b/src/plugin/namecache/test_plugin_namecache_postgres.conf
diff --git a/src/service/namecache/test_plugin_namecache_sqlite.conf b/src/plugin/namecache/test_plugin_namecache_sqlite.conf
index 24eecd286..24eecd286 100644
--- a/src/service/namecache/test_plugin_namecache_sqlite.conf
+++ b/src/plugin/namecache/test_plugin_namecache_sqlite.conf
diff --git a/src/plugin/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
index 3c8e9d170..e413c1b08 100644
--- a/src/plugin/namestore/Makefile.am
+++ b/src/plugin/namestore/Makefile.am
@@ -434,6 +434,5 @@ EXTRA_DIST = \
   perf_namestore_api_sqlite.conf \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
-  test_hostkey \
   $(check_SCRIPTS) \
   $(sql_DATA)
diff --git a/src/plugin/namestore/test_hostkey b/src/plugin/namestore/test_hostkey
deleted file mode 100644
index e69de29bb..000000000
--- a/src/plugin/namestore/test_hostkey
+++ /dev/null
diff --git a/src/service/reclaim/pabc_helper.c b/src/plugin/reclaim/pabc_helper.c
index 65a633f7b..65a633f7b 100644
--- a/src/service/reclaim/pabc_helper.c
+++ b/src/plugin/reclaim/pabc_helper.c
diff --git a/src/service/reclaim/pabc_helper.h b/src/plugin/reclaim/pabc_helper.h
index 045ad5dda..045ad5dda 100644
--- a/src/service/reclaim/pabc_helper.h
+++ b/src/plugin/reclaim/pabc_helper.h
diff --git a/src/rest-plugin/reclaim/Makefile.am b/src/rest-plugin/reclaim/Makefile.am
index 76ca198ab..7bc305bef 100644
--- a/src/rest-plugin/reclaim/Makefile.am
+++ b/src/rest-plugin/reclaim/Makefile.am
@@ -68,7 +68,7 @@ endif
 if HAVE_PABC
 libgnunet_plugin_rest_pabc_la_SOURCES = \
   plugin_rest_pabc.c \
-  pabc_helper.c
+  $(top_builddir)/src/plugin/reclaim/pabc_helper.c
 libgnunet_plugin_rest_pabc_la_LIBADD = \
   $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
   $(top_builddir)/src/lib/json/libgnunetjson.la \
diff --git a/src/cli/gns/test_gns_proxy.conf b/src/service/gns/test_gns_proxy.conf
index 3dfeacafe..3dfeacafe 100644
--- a/src/cli/gns/test_gns_proxy.conf
+++ b/src/service/gns/test_gns_proxy.conf