meson: do not run perf tests in default setup

3 files changed, 28 insertions, 4 deletions

diff --git a/meson.build b/meson.build
index 39ac14eb8..e65e1eebc 100644
--- a/meson.build
+++ b/meson.build
@@ -424,6 +424,9 @@ subdir('data')
 
 meson.add_dist_script('meson-dist-script')
 
+add_test_setup('default', exclude_suites: ['perf'], is_default: true)
+add_test_setup('full', is_default: false)
+
 summary({'host': host_machine.system(),
          'prefix': get_option('prefix'),
          'compiler': cc.get_id(),
diff --git a/src/lib/gnsrecord/meson.build b/src/lib/gnsrecord/meson.build
index 40eff89c1..dd71695ca 100644
--- a/src/lib/gnsrecord/meson.build
+++ b/src/lib/gnsrecord/meson.build
@@ -68,7 +68,7 @@ testgnsrecrd_test_exp = executable ('test_gnsrecord_block_expiration',
 
 test('perf_gnsrecord_crypto', testgnsrecrd_perf_crypto,
    workdir: meson.current_build_dir(),
-   suite: ['gnsrecord'])
+   suite: ['gnsrecord', 'perf'])
 test('test_gnsrecord_crypto', testgnsrecrd_test_crypto,
    workdir: meson.current_build_dir(),
    suite: ['gnsrecord'])
diff --git a/src/lib/util/meson.build b/src/lib/util/meson.build
index 98d9e981c..300854c0e 100644
--- a/src/lib/util/meson.build
+++ b/src/lib/util/meson.build
@@ -598,8 +598,6 @@ test('test_uri', testuri,
    workdir: meson.current_build_dir(),
    suite: ['util', 'util-misc'])
 
-# FIXME Benchmarks
-
 testos_start_process = executable ('test_os_start_process',
           ['test_os_start_process.c'],
           dependencies: [libgnunetutil_dep],
@@ -621,4 +619,27 @@ test('test_common_logging_runtime_loglevels', testcommon_logging_runtime,
    workdir: meson.current_build_dir(),
    suite: ['util', 'util-common'])
 
-
+testutil_perf = [
+  'perf_crypto_asymmetric',
+  # 'perf_crypto_cs', FIXME FTBFS
+  'perf_crypto_ecc_dlog',
+  'perf_crypto_hash',
+  'perf_crypto_paillier',
+  'perf_crypto_rsa',
+  'perf_crypto_symmetric',
+  'perf_malloc',
+  'perf_mq',
+  'perf_scheduler',
+]
+
+foreach t : testutil_perf
+
+  test_filename = t + '.sh'
+  testbin = executable(t, [t + '.c'],
+    dependencies: [libgnunetutil_dep, gcrypt_dep, sodium_dep],
+    include_directories: [incdir, configuration_inc],
+    build_by_default: false,
+    install: false)
+  test(t, testbin, suite: ['util', 'perf'],
+    workdir: meson.current_build_dir())
+endforeach