test: drop $SKIP_INITRD

It's pointless nowadays, since we always need an initrd for the test VMs
as we require modules that are usually not compiled in the kernel.

diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh
index fd1b072c636b59fe85945a71c23c17ad32de9c45..4d480d753b6696fa58f54d40285e8f8b04ee4ef6 100755 (executable)
--- a/test/TEST-16-EXTEND-TIMEOUT/test.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh
@@ -3,7 +3,6 @@
 set -e
 
 TEST_DESCRIPTION="EXTEND_TIMEOUT_USEC=usec start/runtime/stop tests"
-SKIP_INITRD=yes
 TEST_NO_QEMU=1
 
 # shellcheck source=test/test-functions

diff --git a/test/test-functions b/test/test-functions
index b37bb21ba36d41022496bd765ca6b5a9bf7c27b6..663578c629408530dc724e1e06cb4bf14d4ebcee 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -295,7 +295,6 @@ IS_BUILT_WITH_COVERAGE=$(is_built_with_coverage && echo yes || echo no)
 
 if get_bool "$IS_BUILT_WITH_ASAN"; then
     PATH_TO_INIT="$ROOTLIBDIR/systemd-under-asan"
-    SKIP_INITRD="${SKIP_INITRD:-yes}"
     QEMU_MEM="${QEMU_MEM:-2G}"
     QEMU_SMP="${QEMU_SMP:-4}"
 
@@ -577,7 +576,7 @@ run_qemu() {
         kernel_params+=("${user_kernel_append[@]}")
     fi
 
-    if [[ "$INITRD" ]] && ! get_bool "$SKIP_INITRD"; then
+    if [[ -n "$INITRD" ]]; then
         qemu_options+=(-initrd "$INITRD")
     fi