2 files changed, 6 insertions, 7 deletions

diff --git a/src/transport/meson.build b/src/transport/meson.build
index a141ca215..d997aad8a 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -142,7 +142,7 @@ libgnunettransporttesting2 = library('gnunettransporttesting2',
                        libgnunettransportapplication_dep,
                        libgnunettransport_dep,
                        libgnunetpeerstore_dep,
-                       libgnunetats_dep, # FIXME WHY ATS here? Isnt this TNG?
+                       libgnunetats_dep,
                        libgnunettesting_dep,
                        libgnunethello_dep],
         include_directories: [incdir, configuration_inc],
@@ -222,7 +222,6 @@ libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cm
           libgnunetpeerstore_dep,
           libgnunetstatistics_dep,
           libgnunethello_dep,
-          libgnunetats_dep,
           libgnunetarm_dep,
           libgnunetutil_dep
           ],
@@ -241,7 +240,6 @@ libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_
           libgnunetpeerstore_dep,
           libgnunetstatistics_dep,
           libgnunethello_dep,
-          libgnunetats_dep,
           libgnunetarm_dep,
           libgnunetutil_dep
           ],
@@ -260,7 +258,6 @@ libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_
           libgnunetpeerstore_dep,
           libgnunetstatistics_dep,
           libgnunethello_dep,
-          libgnunetats_dep,
           libgnunetarm_dep,
           libgnunetutil_dep
           ],
@@ -279,7 +276,6 @@ libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugi
           libgnunetpeerstore_dep,
           libgnunetstatistics_dep,
           libgnunethello_dep,
-          libgnunetats_dep,
           libgnunetarm_dep,
           libgnunetutil_dep
           ],
@@ -298,7 +294,6 @@ libgnunettesttransport_cmd_udpback = library('gnunet_test_transport_plugin_cmd_u
           libgnunetpeerstore_dep,
           libgnunetstatistics_dep,
           libgnunethello_dep,
-          libgnunetats_dep,
           libgnunetarm_dep,
           libgnunetutil_dep
           ],
@@ -317,7 +312,6 @@ libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_n
           libgnunetpeerstore_dep,
           libgnunetstatistics_dep,
           libgnunethello_dep,
-          libgnunetats_dep,
           libgnunetarm_dep,
           libgnunetutil_dep
           ],
diff --git a/src/util/meson.build b/src/util/meson.build
index 6fc613a4e..b5d156ea6 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -187,6 +187,7 @@ executable ('gnunet-crypto-tvg',
 testcommonalloc = executable ('test_common_allocation',
             ['test_common_allocation.c'],
             dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            build_by_default: false,
             include_directories: [incdir, configuration_inc],
             install: false)
 test('test_common_allocation', testcommonalloc,
@@ -195,6 +196,7 @@ test('test_common_allocation', testcommonalloc,
 testcommonlog = executable ('test_common_logging',
             ['test_common_logging.c'],
             dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            build_by_default: false,
             include_directories: [incdir, configuration_inc],
             install: false)
 test('test_common_logging', testcommonlog,
@@ -203,6 +205,7 @@ test('test_common_logging', testcommonlog,
 testcommonendian = executable ('test_common_endian',
             ['test_common_endian.c'],
             dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            build_by_default: false,
             include_directories: [incdir, configuration_inc],
             install: false)
 test('test_common_endian', testcommonendian,
@@ -211,6 +214,7 @@ test('test_common_endian', testcommonendian,
 testconf = executable ('test_configuration',
             ['test_configuration.c'],
             dependencies: [libgnunetutil_dep, libgnunetutil_dep],
+            build_by_default: false,
             include_directories: [incdir, configuration_inc],
             install: false)
 test('test_configuration', testconf,
@@ -220,6 +224,7 @@ testcontainerbloom = executable ('test_container_bloomfilter',
             ['test_container_bloomfilter.c'],
             dependencies: [libgnunetutil_dep, libgnunetutil_dep],
             include_directories: [incdir, configuration_inc],
+            build_by_default: false,
             install: false)
 test('test_container_bloomfilter', testcontainerbloom,
      workdir: meson.current_source_dir(),