diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-06-07 15:21:10 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-06-07 15:23:36 +0200 |
| commit | 93b896e90e6da99c0436ab69dfaf384784358605 (patch) | |
| tree | 3c7294ac91174c0ede6f5d4da84dd45490ef71e2 | |
| parent | test: rebuild the ldconfig cache after changing its configuration (diff) | |
| download | systemd-93b896e90e6da99c0436ab69dfaf384784358605.tar.xz systemd-93b896e90e6da99c0436ab69dfaf384784358605.zip | |
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.
| -rwxr-xr-x | test/TEST-16-EXTEND-TIMEOUT/test.sh | 1 | ||||
| -rw-r--r-- | test/test-functions | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh index fd1b072c63..4d480d753b 100755 --- 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 b37bb21ba3..663578c629 100644 --- 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 |