From cce30eddaa39cfa14bdde44fa79950be549aef66 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Tue, 23 Apr 2024 12:35:51 -0400
Subject: [PATCH] Run test setup as initial tests

- This way test setup runs during meson test and not the compile test
- This way it runs only once
  I tried with add_test_setup() but that would cause the setup programs
  to be re-executed before each and every test

Signed-off-by: Simo Sorce <simo@redhat.com>
---
 tests/meson.build | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/tests/meson.build b/tests/meson.build
index 46343296..fd402b53 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -30,25 +30,20 @@ if nss_softokn.found()
   endif
 endif
 
-softoken_conf = custom_target(
-  'generate softoken configuration',
-  output: 'tmp.softokn.log',
-  env: conf_env,
-  command: [
-    find_program('setup-softokn.sh'),
-  ],
-  capture: true,
-)
+test_setup = {
+  'setup_softokn': {'suite': 'softokn', 'exe': find_program('setup-softokn.sh')},
+  'setup_softhsm': {'suite': 'softhsm', 'exe': find_program('setup-softhsm.sh')},
+}
 
-softhsm_conf = custom_target(
-  'generate softhsm configuration',
-  output: 'tmp.softhsm.log',
-  env: conf_env,
-  command: [
-    find_program('setup-softhsm.sh'),
-  ],
-  capture: true,
-)
+foreach name, targs : test_setup
+  test(
+    name,
+    targs.get('exe'),
+    suite: targs.get('suite'),
+    env: conf_env,
+    is_parallel: false,
+  )
+endforeach
 
 test_env = environment({
   'TEST_PATH': meson.current_source_dir(),
@@ -148,7 +143,6 @@ foreach t, extra_args : tests
       test_wrapper,
       args: '@0@-@1@.t'.format(t, suite),
       suite: suite,
-      depends: [softoken_conf, softhsm_conf],
       env: test_env,
       is_parallel: is_parallel,
     )