[gnunet] branch master updated: BUILD: Remove --disable-testing. Issue #7033

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 4e7e81f4d BUILD: Remove --disable-testing. Issue #7033
4e7e81f4d is described below

commit 4e7e81f4d1305df169d3f7623948a142aa47936b
Author: Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de>
AuthorDate: Mon Oct 11 23:43:04 2021 +0200

    BUILD: Remove --disable-testing. Issue #7033
---
 configure.ac                  | 9 ---------
 src/Makefile.am               | 6 ++----
 src/ats/Makefile.am           | 2 --
 src/cadet/Makefile.am         | 4 ----
 src/consensus/Makefile.am     | 2 --
 src/core/Makefile.am          | 6 ++----
 src/datacache/Makefile.am     | 2 --
 src/datastore/Makefile.am     | 6 ------
 src/dht/Makefile.am           | 6 ------
 src/fs/Makefile.am            | 6 ------
 src/identity/Makefile.am      | 2 --
 src/namecache/Makefile.am     | 8 --------
 src/namestore/Makefile.am     | 6 ------
 src/nse/Makefile.am           | 4 ----
 src/peerinfo/Makefile.am      | 2 --
 src/peerstore/Makefile.am     | 2 --
 src/pt/Makefile.am            | 4 ----
 src/regex/Makefile.am         | 2 --
 src/rps/Makefile.am           | 4 ----
 src/secretsharing/Makefile.am | 2 --
 src/set/Makefile.am           | 4 ----
 src/seti/Makefile.am          | 4 ----
 src/setu/Makefile.am          | 4 ----
 src/topology/Makefile.am      | 2 --
 src/transport/Makefile.am     | 4 ----
 src/util/Makefile.am          | 6 ++----
 26 files changed, 6 insertions(+), 103 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3e206301..5e9e3d275 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1746,15 +1746,6 @@ AC_ARG_ENABLE([benchmarks],
 AC_MSG_RESULT($enable_benchmarks)
 AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"])
 
-# should gnunet-testing be compiled
-AC_MSG_CHECKING(whether to compile gnunet-testing)
-AC_ARG_ENABLE([testing],
-   [AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])],
-   [enable_testing=${enableval}],
-   [enable_testing=yes])
-AC_MSG_RESULT($enable_testing)
-AM_CONDITIONAL([HAVE_TESTING], [test "x$enable_testing" = "xyes"])
-
 # should experimental code be compiled (code that may not yet compile)?
 AC_MSG_CHECKING(whether to compile experimental code)
 AC_ARG_ENABLE([experimental],
diff --git a/src/Makefile.am b/src/Makefile.am
index ef8c5b110..31215c6d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,7 @@
 # This Makefile.am is in the public domain
 
-if HAVE_TESTING
- TESTING = testing
- TESTBED = testbed-logger testbed
-endif
+TESTING = testing
+TESTBED = testbed-logger testbed
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 0b8e7309a..85a2bb555 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -65,11 +65,9 @@ gnunet_service_ats_LDADD = \
   libgnunetats.la \
   $(GN_LIBINTL)
 
-if HAVE_TESTING
 TESTING_TESTS = \
  test_ats_api_proportional \
  test_ats_reservation_api_proportional
-endif
 
 check_PROGRAMS = \
  $(TESTING_TESTS)
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 2289a2d96..d942c6495 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -78,12 +78,9 @@ if LINUX
 endif
 
 
-if HAVE_TESTING
  noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP)
 # noinst_PROGRAMS = gnunet-cadet-profiler
-endif
 
-if HAVE_TESTING
 check_PROGRAMS = \
   test_cadet_local_mq \
   test_cadet_2_forward \
@@ -106,7 +103,6 @@ check_PROGRAMS = \
   test_cadet_5_speed_reliable_backwards \
   test_cadet_5_speed_backwards \
   test_cadet_5_reopen
-endif
 
 
 #gnunet_cadet_profiler_SOURCES = \
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index cf1d32e74..d7b23e7c6 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -89,7 +89,6 @@ libgnunet_plugin_block_consensus_la_LDFLAGS = \
 
 
 
-if HAVE_TESTING
 bin_PROGRAMS = \
  gnunet-consensus-profiler
 
@@ -100,7 +99,6 @@ if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
-endif
 
 test_consensus_api_SOURCES = \
  test_consensus_api.c
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index d2d3a2d7f..e51247e18 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -54,10 +54,8 @@ gnunet_core_LDADD = \
 gnunet_core_LDFLAGS = \
   $(GN_LIBINTL)
 
-if HAVE_TESTING
-  TESTING_TESTS = \
-    test_core_api_send_to_self
-endif
+TESTING_TESTS = \
+  test_core_api_send_to_self
 
 check_PROGRAMS = \
  test_core_api_start_only \
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index ecb02d1c3..4789706ff 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -85,7 +85,6 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 
-if HAVE_TESTING
 if HAVE_SQLITE
 if HAVE_BENCHMARKS
  SQLITE_BENCHMARKS = \
@@ -95,7 +94,6 @@ SQLITE_TESTS = \
  test_datacache_sqlite \
  test_datacache_quota_sqlite \
  $(SQLITE_BENCHMARKS)
-endif
 
 if HAVE_BENCHMARKS
  HEAP_BENCHMARKS = \
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index cd1df4e5e..07ae004b3 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -52,7 +52,6 @@ gnunet_datastore_LDADD = \
 
 if HAVE_MYSQL
  MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la
-if HAVE_TESTING
 if HAVE_BENCHMARKS
   MYSQL_BENCHMARKS = \
    perf_datastore_api_mysql \
@@ -64,10 +63,8 @@ endif
   test_plugin_datastore_mysql \
   $(MYSQL_BENCHMARKS)
 endif
-endif
 if HAVE_SQLITE
  SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
-if HAVE_TESTING
 if HAVE_BENCHMARKS
   SQLITE_BENCHMARKS = \
    perf_datastore_api_sqlite \
@@ -79,10 +76,8 @@ endif
   test_plugin_datastore_sqlite \
   $(SQLITE_BENCHMARKS)
 endif
-endif
 if HAVE_POSTGRESQL
  POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la
-if HAVE_TESTING
 if HAVE_BENCHMARKS
   POSTGRES_BENCHMARKS = \
    perf_datastore_api_postgres \
@@ -94,7 +89,6 @@ endif
   test_plugin_datastore_postgres \
   $(POSTGRES_BENCHMARKS)
 endif
-endif
 
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 919eca438..69e34000c 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -52,10 +52,8 @@ bin_PROGRAMS = \
  gnunet-dht-get \
  gnunet-dht-put
 
-if HAVE_TESTING
 noinst_PROGRAMS = \
  gnunet-dht-profiler
-endif
 
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c gnunet-service-dht.h \
@@ -117,9 +115,7 @@ gnunet_dht_profiler_LDADD = \
 gnunet_dht_profiler_LDFLAGS = \
   $(GN_LIBINTL)
 
-if HAVE_TESTING
 noinst_LIBRARIES = libgnunetdhttest.a
-endif
 
 libgnunetdhttest_a_SOURCES = \
   dht_test_lib.c dht_test_lib.h
@@ -128,7 +124,6 @@ libgnunetdhttest_a_LIBADD = \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  libgnunetdht.la
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_dht_api \
  test_dht_twopeer \
@@ -136,7 +131,6 @@ check_PROGRAMS = \
  test_dht_line \
  test_dht_2dtorus \
  test_dht_monitor
-endif
 
 if HAVE_EXPERIMENTAL
 # These tests still do not work as testbed does
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 5b6ba2376..3d8ec2bac 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -21,9 +21,7 @@ lib_LTLIBRARIES = libgnunetfs.la
 plugin_LTLIBRARIES = \
   libgnunet_plugin_block_fs.la
 
-if HAVE_TESTING
 noinst_LIBRARIES = libgnunetfstest.a
-endif
 
 libgnunetfs_la_SOURCES = \
   fs_api.c fs_api.h fs.h \
@@ -71,11 +69,9 @@ libexec_PROGRAMS = \
   gnunet-helper-fs-publish \
   gnunet-service-fs
 
-if HAVE_TESTING
 noinst_PROGRAMS = \
   gnunet-fs-profiler \
   gnunet-daemon-fsprofiler
-endif
 
 bin_PROGRAMS = \
   gnunet-auto-share \
@@ -230,7 +226,6 @@ if HAVE_BENCHMARKS
  perf_gnunet_service_fs_p2p_respect
 endif
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_plugin_block_fs \
  test_fs_directory \
@@ -258,7 +253,6 @@ check_PROGRAMS = \
  test_gnunet_service_fs_p2p \
  test_gnunet_service_fs_p2p_cadet \
  $(FS_BENCHMARKS)
-endif
 
 test_plugin_block_fs_SOURCES = \
  test_plugin_block_fs.c
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index e806f0059..59ace6c41 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -67,11 +67,9 @@ gnunet_identity_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_identity \
  test_identity_defaults 
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 8ffa85ddb..272f16b77 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -17,30 +17,22 @@ endif
 
 if HAVE_EXPERIMENTAL
 FLAT_PLUGIN = libgnunet_plugin_namecache_flat.la
-if HAVE_TESTING
 FLAT_TESTS = test_plugin_namecache_flat
 endif
-endif
 
 if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_namecache_sqlite.la
-if HAVE_TESTING
 SQLITE_TESTS = test_plugin_namecache_sqlite
 endif
-endif
 
 if HAVE_POSTGRESQL
 POSTGRES_PLUGIN = libgnunet_plugin_namecache_postgres.la
-if HAVE_TESTING
 POSTGRES_TESTS = test_plugin_namecache_postgres
 endif
-endif
 
 # testcases do not even build yet; thus: experimental!
-if HAVE_TESTING
 TESTING_TESTS = \
  test_namecache_api_cache_block
-endif
 
 if HAVE_SQLITE
 check_PROGRAMS = \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 18e6a196b..51708dd67 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -16,7 +16,6 @@ if USE_COVERAGE
 endif
 
 HEAP_PLUGIN = libgnunet_plugin_namestore_flat.la
-if HAVE_TESTING
 HEAP_TESTS = test_plugin_namestore_flat \
  test_namestore_api_store_flat \
  test_namestore_api_store_update_flat \
@@ -35,11 +34,9 @@ HEAP_TESTS = test_plugin_namestore_flat \
  test_namestore_api_monitoring_existing_flat \
  test_namestore_api_zone_to_name_flat \
  perf_namestore_api_zone_iteration_flat
-endif
 
 if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
-if HAVE_TESTING
 SQLITE_TESTS = test_plugin_namestore_sqlite \
  test_namestore_api_store_sqlite \
  test_namestore_api_store_update_sqlite \
@@ -59,11 +56,9 @@ SQLITE_TESTS = test_plugin_namestore_sqlite \
  test_namestore_api_zone_to_name_sqlite \
  perf_namestore_api_zone_iteration_sqlite
 endif
-endif
 
 if HAVE_POSTGRESQL
 POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
-if HAVE_TESTING
 POSTGRES_TESTS = test_plugin_namestore_postgres \
  test_namestore_api_store_postgres \
  test_namestore_api_store_update_postgres \
@@ -83,7 +78,6 @@ POSTGRES_TESTS = test_plugin_namestore_postgres \
  test_namestore_api_zone_to_name_postgres \
  perf_namestore_api_zone_iteration_postgres
 endif
-endif
 
 if HAVE_SQLITE
 check_PROGRAMS = \
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 824aa10d4..0c6182e61 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -36,10 +36,8 @@ libgnunetnse_la_LDFLAGS = \
 libexec_PROGRAMS = \
  gnunet-service-nse
 
-if HAVE_TESTING
 noinst_PROGRAMS = \
  gnunet-nse-profiler
-endif
 
 gnunet_nse_profiler_SOURCES = \
  gnunet-nse-profiler.c
@@ -71,12 +69,10 @@ if HAVE_BENCHMARKS
   MULTIPEER_TEST = test_nse_multipeer
 endif
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_nse_api \
  perf_kdf \
  $(MULTIPEER_TEST)
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index e61e5a13d..cdab22a9d 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -48,14 +48,12 @@ if HAVE_BENCHMARKS
  perf_peerinfo_api
 endif
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_peerinfo_shipped_hellos \
  test_peerinfo_api \
  test_peerinfo_api_friend_only \
  test_peerinfo_api_notify_friend_only \
  $(PEERINFO_BENCHMARKS)
-endif
 
 
 if ENABLE_TEST_RUN
diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index babf40654..d9904e59d 100644
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -63,9 +63,7 @@ endif
 
 if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la
-if HAVE_TESTING
 SQLITE_TESTS = test_plugin_peerstore_sqlite
-endif
 libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
   plugin_peerstore_sqlite.c
 libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 10ae04931..fc2cb592c 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -28,8 +28,6 @@ gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
-if HAVE_TESTING
-
 if HAVE_LIBGNURL
 LIB_GNURL=@LIBGNURL@
 CPP_GNURL=@LIBGNURL_CPPFLAGS@
@@ -56,8 +54,6 @@ endif
 endif
 endif
 
-endif
-
 check_PROGRAMS = $(VPN_TEST)
 
 if ENABLE_TEST_RUN
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 9a7466cb2..2dbf3a3f9 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -102,11 +102,9 @@ libgnunetregextest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetregex_internal.a
 
-if HAVE_TESTING
 noinst_PROGRAMS = $(noinst_mysql_progs) \
   perf-regex \
   gnunet-regex-profiler
-endif
 
 perf_regex_SOURCES = \
   perf-regex.c
diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am
index b9de6b5e3..b5e8c0617 100644
--- a/src/rps/Makefile.am
+++ b/src/rps/Makefile.am
@@ -45,10 +45,8 @@ libgnunetrps_la_CFLAGS = $(AM_CFLAGS)
 libexec_PROGRAMS = \
  gnunet-service-rps
 
-if HAVE_TESTING
 noinst_PROGRAMS = \
  gnunet-rps-profiler
-endif
 
 
 gnunet_service_rps_SOURCES = \
@@ -74,7 +72,6 @@ gnunet_service_rps_LDADD = \
   $(GN_LIBINTL)
 
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_service_rps_view \
  test_service_rps_custommap \
@@ -91,7 +88,6 @@ check_PROGRAMS += \
  test_rps_malicious_2 \
  test_rps_malicious_3
 endif
-endif
 
 rps_test_src = \
        test_rps.c \
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 9ae6e7892..13dd0bd8d 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -51,7 +51,6 @@ libgnunetsecretsharing_la_LIBADD = \
 libgnunetsecretsharing_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-if HAVE_TESTING
 bin_PROGRAMS = \
  gnunet-secretsharing-profiler
 
@@ -62,7 +61,6 @@ if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
-endif
 
 test_secretsharing_api_SOURCES = \
  test_secretsharing_api.c
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index d6b10a1f8..837d42ff5 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -14,13 +14,11 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-if HAVE_TESTING
 bin_PROGRAMS = \
  gnunet-set-profiler
 
 noinst_PROGRAMS = \
  gnunet-set-ibf-profiler
-endif
 
 libexec_PROGRAMS = \
  gnunet-service-set
@@ -69,13 +67,11 @@ libgnunetset_la_LIBADD = \
 libgnunetset_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_set_api \
  test_set_union_result_symmetric \
  test_set_intersection_result_full \
  test_set_union_copy
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am
index 522f33ece..8441c5060 100644
--- a/src/seti/Makefile.am
+++ b/src/seti/Makefile.am
@@ -14,10 +14,8 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-if HAVE_TESTING
 bin_PROGRAMS = \
  gnunet-seti-profiler
-endif
 
 libexec_PROGRAMS = \
  gnunet-service-seti
@@ -55,10 +53,8 @@ libgnunetseti_la_LIBADD = \
 libgnunetseti_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_seti_api
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am
index 77d048add..897bf3f86 100644
--- a/src/setu/Makefile.am
+++ b/src/setu/Makefile.am
@@ -14,13 +14,11 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-if HAVE_TESTING
 bin_PROGRAMS = \
  gnunet-setu-profiler
 
 noinst_PROGRAMS = \
  gnunet-setu-ibf-profiler
-endif
 
 libexec_PROGRAMS = \
  gnunet-service-setu
@@ -67,11 +65,9 @@ libgnunetsetu_la_LIBADD = \
 libgnunetsetu_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_setu_api \
  perf_setu_api
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index 8580d200c..e5920116b 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -42,10 +42,8 @@ gnunet_daemon_topology_LDADD = \
   $(GN_LIBINTL)
 
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_gnunet_daemon_topology
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 32075ee16..a539f3f25 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -128,11 +128,9 @@ noinst_PROGRAMS = \
  $(WLAN_BIN_SENDER) \
  $(WLAN_BIN_RECEIVER)
 
-if HAVE_TESTING
 TESTING_LIBS = \
   libgnunettransporttesting.la \
   libgnunettransporttesting2.la
-endif
 
 lib_LTLIBRARIES = \
   libgnunettransport.la \
@@ -594,7 +592,6 @@ libgnunet_plugin_transport_https_server_la_LDFLAGS = \
 libgnunet_plugin_transport_https_server_la_CFLAGS = \
  $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS
 
-if HAVE_TESTING
 check_PROGRAMS = \
  test_transport_simple_send \
  test_transport_simple_send_v2 \
@@ -682,7 +679,6 @@ check_PROGRAMS += \
   test_communicator_backchannel-udp \
   test_communicator_bidirect-tcp
 endif
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a3a77073e..c3a0feccc 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -145,10 +145,8 @@ libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 14:0:0
 
-if HAVE_TESTING
-  GNUNET_ECC = gnunet-ecc
-  GNUNET_SCRYPT = gnunet-scrypt
-endif
+GNUNET_ECC = gnunet-ecc
+GNUNET_SCRYPT = gnunet-scrypt
 
 lib_LTLIBRARIES = libgnunetutil.la
 

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