shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-11 04:58:19 +03:00
Code

test: drop $SKIP_INITRD

Browse Source 
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.

(cherry picked from commit 93b896e90e6da99c0436ab69dfaf384784358605)
(cherry picked from commit 7405e06205f3646ff8ca2e59a2147533e04d9bca)
This commit is contained in:
Frantisek Sumsal 2023-06-07 15:21:10 +02:00 committed by Luca Boccassi
parent eb2bce667a
commit b8583d48e9
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/TEST-16-EXTEND-TIMEOUT/test.sh
View File

@ -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

3
test/test-functions
View File

@ -285,7 +285,6 @@ IS_BUILT_WITH_COVERAGE=$(is_built_with_coverage && echo yes || echo no)
if get_bool "$IS_BUILT_WITH_ASAN"; then
STRIP_BINARIES=no
PATH_TO_INIT="$ROOTLIBDIR/systemd-under-asan"
SKIP_INITRD="${SKIP_INITRD:-yes}"
QEMU_MEM="${QEMU_MEM:-2G}"
QEMU_SMP="${QEMU_SMP:-4}"
@ -561,7 +560,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