mirror of
https://github.com/systemd/systemd
synced 2024-10-14 20:17:52 +00:00
test: allow overriding $QEMU_MEM when running w/ ASan
This commit is contained in:
parent
56e8ee55d5
commit
dc350e78fe
|
@ -9,7 +9,7 @@ TEST_NO_NSPAWN=1
|
||||||
. "${TEST_BASE_DIR:?}/test-functions"
|
. "${TEST_BASE_DIR:?}/test-functions"
|
||||||
|
|
||||||
if qemu_min_version "5.2.0"; then
|
if qemu_min_version "5.2.0"; then
|
||||||
QEMU_OPTIONS="-object memory-backend-ram,id=mem0,size=${QEMU_MEM:?} -numa node,memdev=mem0,nodeid=0"
|
QEMU_OPTIONS="-object memory-backend-ram,id=mem0,size=${QEMU_MEM:-512M} -numa node,memdev=mem0,nodeid=0"
|
||||||
else
|
else
|
||||||
QEMU_OPTIONS="-numa node,nodeid=0"
|
QEMU_OPTIONS="-numa node,nodeid=0"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -30,7 +30,6 @@ TIMED_OUT= # will be 1 after run_* if *_TIMEOUT is set and test timed out
|
||||||
[[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}"
|
[[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}"
|
||||||
UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"
|
UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"
|
||||||
EFI_MOUNT="${EFI_MOUNT:-$(bootctl -x 2>/dev/null || echo /boot)}"
|
EFI_MOUNT="${EFI_MOUNT:-$(bootctl -x 2>/dev/null || echo /boot)}"
|
||||||
QEMU_MEM="${QEMU_MEM:-512M}"
|
|
||||||
# Note that defining a different IMAGE_NAME in a test setup script will only result
|
# Note that defining a different IMAGE_NAME in a test setup script will only result
|
||||||
# in default.img being copied and renamed. It can then be extended by defining
|
# in default.img being copied and renamed. It can then be extended by defining
|
||||||
# a test_append_files() function. The $1 parameter will be the root directory.
|
# a test_append_files() function. The $1 parameter will be the root directory.
|
||||||
|
@ -262,7 +261,7 @@ if get_bool "$IS_BUILT_WITH_ASAN"; then
|
||||||
STRIP_BINARIES=no
|
STRIP_BINARIES=no
|
||||||
SKIP_INITRD="${SKIP_INITRD:-yes}"
|
SKIP_INITRD="${SKIP_INITRD:-yes}"
|
||||||
PATH_TO_INIT=$ROOTLIBDIR/systemd-under-asan
|
PATH_TO_INIT=$ROOTLIBDIR/systemd-under-asan
|
||||||
QEMU_MEM="2048M"
|
QEMU_MEM="${QEMU_MEM:-2G}"
|
||||||
QEMU_SMP="${QEMU_SMP:-4}"
|
QEMU_SMP="${QEMU_SMP:-4}"
|
||||||
|
|
||||||
# We need to correctly distinguish between gcc's and clang's ASan DSOs.
|
# We need to correctly distinguish between gcc's and clang's ASan DSOs.
|
||||||
|
@ -456,7 +455,7 @@ run_qemu() {
|
||||||
qemu_options+=(
|
qemu_options+=(
|
||||||
-smp "$QEMU_SMP"
|
-smp "$QEMU_SMP"
|
||||||
-net none
|
-net none
|
||||||
-m "$QEMU_MEM"
|
-m "${QEMU_MEM:-512M}"
|
||||||
-nographic
|
-nographic
|
||||||
-kernel "$KERNEL_BIN"
|
-kernel "$KERNEL_BIN"
|
||||||
-drive "format=raw,cache=unsafe,file=$image"
|
-drive "format=raw,cache=unsafe,file=$image"
|
||||||
|
|
Loading…
Reference in a new issue