Address various issues with meson builds

.github/workflows/address-sanitizer.yml

@@ -63,6 +63,7 @@ jobs:
           name: Address sanitizer logs on ${{ matrix.name }}
           path: |
             builddir/meson-logs/
+            builddir/tests/*.log
             builddir/tests/tmp.${{ matrix.token }}/p11prov-debug.log
             builddir/tests/tmp.${{ matrix.token }}/testvars
             builddir/tests/tmp.${{ matrix.token }}/openssl.cnf

.github/workflows/build.yml

@@ -130,6 +130,7 @@ jobs:
           name: Test logs on macOS-12 with ${{ matrix.token }}
           path: |
             builddir/meson-logs/*
+            builddir/tests/*.log
             builddir/tests/tmp.${{ matrix.token }}/p11prov-debug.log
             builddir/tests/tmp.${{ matrix.token }}/testvars
             builddir/tests/tmp.${{ matrix.token }}/openssl.cnf

Makefile

@@ -1,8 +1,10 @@
 .PHONY: all check check-style check-style-show check-style-fix clean generate-code generate-docs
 
 all:
-	meson setup builddir
-	meson compile -C builddir
+	if [ ! -d "builddir" ]; then \
+		meson setup builddir; \
+	fi; \
+	meson compile -C builddir pkcs11
 
 check:
 	meson test -C builddir

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(),
@@ -109,10 +104,13 @@ test_programs = [
   'pincache',
 ]
 
+test_executables = []
 foreach t : test_programs
-  executable(t, '@[email protected]'.format(t),
-             include_directories: [configinc],
-             dependencies: [libcrypto, libssl])
+  t = executable(t, '@[email protected]'.format(t),
+                 build_by_default: false,
+                 include_directories: [configinc],
+                 dependencies: [libcrypto, libssl])
+  test_executables += [t]
 endforeach
 
 tests = {
@@ -148,9 +146,9 @@ foreach t, extra_args : tests
       test_wrapper,
       args: '@0@-@[email protected]'.format(t, suite),
       suite: suite,
-      depends: [softoken_conf, softhsm_conf],
       env: test_env,
-      is_parallel: is_parallel,
+      depends: test_executables,
+      is_parallel: false,
     )
   endforeach
 endforeach

tests/test-wrapper

@@ -47,5 +47,10 @@ for option in "${TEST_PARAMS[@]}"; do
     fi
 done
 
+LOGFILE="${TESTBLDDIR}/${TEST_NAME}.${TOKEN_DRIVER}.log"
+
 echo "Executing ${COMMAND}"
-${COMMAND}
+(
+  set -o pipefail
+  ${COMMAND} | tee "${LOGFILE}"
+)