summaryrefslogtreecommitdiffstats
path: root/test/test-functions
diff options
context:
space:
mode:
authorThomas Blume <Thomas.Blume@suse.com>2024-09-19 12:02:27 +0200
committerFrantisek Sumsal <frantisek@sumsal.cz>2024-10-07 11:40:17 +0200
commit5540c37bb8b275cb58b1c936ff701d1c80503e9b (patch)
treec728808ecfa7ed795f4d0cf4c065a9b60ab3543d /test/test-functions
parentmkosi: Switch to Fedora 41 (diff)
downloadsystemd-5540c37bb8b275cb58b1c936ff701d1c80503e9b.tar.xz
systemd-5540c37bb8b275cb58b1c936ff701d1c80503e9b.zip
test: set TEST_NESTED_KVM as default
Diffstat (limited to 'test/test-functions')
-rw-r--r--test/test-functions12
1 files changed, 5 insertions, 7 deletions
diff --git a/test/test-functions b/test/test-functions
index 64a664b69e..269cd8812b 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -84,14 +84,12 @@ add_at_exit_handler() {
}
# Decide if we can (and want to) run qemu with KVM acceleration.
-# Check if nested KVM is explicitly enabled (TEST_NESTED_KVM). If not,
-# check if it's not explicitly disabled (TEST_NO_KVM) and we're not already
-# running under KVM. If these conditions are met, enable KVM (and possibly
-# nested KVM), otherwise disable it.
-if get_bool "${TEST_NESTED_KVM:=}" || (! get_bool "${TEST_NO_KVM:=}" && ! systemd-detect-virt -qv); then
- QEMU_KVM=yes
-else
+# Check if KVM is not explicitly disabled (TEST_NO_KVM), otherwise
+# enable KVM (and possibly nested KVM).
+if get_bool "${TEST_NO_KVM:=}"; then
QEMU_KVM=no
+else
+ QEMU_KVM=yes
fi
if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then