From eda0e525d35db485418e908e7a30c106b8587251 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sun, 26 Jun 2022 20:57:31 +0200
Subject: [PATCH] test: run TEST-21 in nspawn only if $TEST_PREFER_NSPAWN is
 set

so we can run it under nspawn in CIs which don't support nested KVM, but
avoid running it twice (both under nspawn and qemu) in CIs which support
both methods.
---
 test/TEST-21-DFUZZER/test.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/TEST-21-DFUZZER/test.sh b/test/TEST-21-DFUZZER/test.sh
index 7669e4e0ad..eb0a6549e0 100755
--- a/test/TEST-21-DFUZZER/test.sh
+++ b/test/TEST-21-DFUZZER/test.sh
@@ -3,7 +3,6 @@
 set -e
 
 TEST_DESCRIPTION="Fuzz our D-Bus interfaces with dfuzzer"
-TEST_NO_NSPAWN=1
 TEST_SUPPORTING_SERVICES_SHOULD_BE_MASKED=0
 QEMU_TIMEOUT="${QEMU_TIMEOUT:-1800}"
 IMAGE_NAME=dfuzzer
@@ -12,6 +11,13 @@ TEST_FORCE_NEWIMAGE=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
+# Run the test either only under nspawn (if $TEST_PREFER_NSPAWN is set to true)
+# or only uder qemu otherwise, to avoid running the test twice on machines where
+# we can do both.
+if ! get_bool "${TEST_PREFER_NSPAWN:=}"; then
+    TEST_NO_NSPAWN=1
+fi
+
 command -v dfuzzer >/dev/null || exit 0
 
 if ! get_bool "$IS_BUILT_WITH_ASAN"; then