morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

test: Look for qemu in /usr/libexec/qemu-kvm as well

Browse Source 
On CentOS Stream, the qemu binary is /usr/libexec/qemu-kvm so use
that if it's available.
This commit is contained in:
Daan De Meyer
2025-01-21 12:29:56 +01:00
parent cb13d6b44f
commit 34da8dd345
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/TEST-64-UDEV-STORAGE/nvme_basic.configure
View File

@@ -3,13 +3,14 @@
import json
import os
import shutil
import subprocess
import sys
config = json.load(sys.stdin)
qemu = f"qemu-system-{os.environ['QEMU_ARCHITECTURE']}"
qemu = shutil.which("/usr/libexec/qemu-kvm") or f"qemu-system-{os.environ['QEMU_ARCHITECTURE']}"
result = subprocess.run([qemu, "-device", "help"], check=True, text=True, stdout=subprocess.PIPE)
if 'name "nvme"' not in result.stdout:
print("nvme device driver is not available, skipping test...", file=sys.stderr)

3
test/TEST-64-UDEV-STORAGE/nvme_subsystem.configure
View File

@@ -3,13 +3,14 @@
import json
import os
import shutil
import subprocess
import sys
config = json.load(sys.stdin)
qemu = f"qemu-system-{os.environ['QEMU_ARCHITECTURE']}"
qemu = shutil.which("/usr/libexec/qemu-kvm") or f"qemu-system-{os.environ['QEMU_ARCHITECTURE']}"
result = subprocess.run([qemu, "-device", "help"], check=True, text=True, stdout=subprocess.PIPE)
if 'name "nvme"' not in result.stdout:
print("nvme device driver is not available, skipping test...", file=sys.stderr)

3
test/TEST-64-UDEV-STORAGE/virtio_scsi_identically_named_partitions.configure
View File

@@ -3,13 +3,14 @@
import json
import os
import shutil
import subprocess
import sys
config = json.load(sys.stdin)
qemu = f"qemu-system-{os.environ['QEMU_ARCHITECTURE']}"
qemu = shutil.which("/usr/libexec/qemu-kvm") or f"qemu-system-{os.environ['QEMU_ARCHITECTURE']}"
result = subprocess.run([qemu, "-device", "help"], check=True, text=True, stdout=subprocess.PIPE)
if 'name "virtio-scsi-pci"' not in result.stdout:
print("virtio-scsi-pci device driver is not available, skipping test...", file=sys.stderr)