test: increase QEMU_MEM for some tests

These tests have a tendency to fail with OOM on the autopkgtest
infrastructure. Increase QEMU_MEM to try and alleviate that.

Gbp-Pq: Name test-increase-QEMU_MEM-for-some-tests.patch
This commit is contained in:
Nick Rosbrook 2022-06-21 10:52:39 -04:00 committed by liaoxianfu
parent c6708c2c93
commit 06464651bb
22 changed files with 33 additions and 0 deletions

View File

@ -10,6 +10,7 @@ TEST_NO_NSPAWN=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_TIMEOUT=300 QEMU_TIMEOUT=300
QEMU_MEM="1024M"
TEST_FORCE_NEWIMAGE=1 TEST_FORCE_NEWIMAGE=1
do_test "$@" do_test "$@"

View File

@ -9,5 +9,6 @@ TEST_NO_NSPAWN=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_TIMEOUT=300 QEMU_TIMEOUT=300
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -9,5 +9,6 @@ TEST_NO_NSPAWN=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_TIMEOUT=300 QEMU_TIMEOUT=300
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -27,4 +27,6 @@ test_append_files() {
) )
} }
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -13,4 +13,6 @@ test_append_files() {
printf "556f48e837bc4424a710fa2e2c9d3e3c\ne3d\n" >"${1:?}/etc/machine-id" printf "556f48e837bc4424a710fa2e2c9d3e3c\ne3d\n" >"${1:?}/etc/machine-id"
} }
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -10,5 +10,6 @@ TEST_NO_NSPAWN=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_TIMEOUT=800 QEMU_TIMEOUT=800
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -9,6 +9,7 @@ TEST_NO_NSPAWN=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_TIMEOUT=600 QEMU_TIMEOUT=600
QEMU_MEM="1024M"
UNIFIED_CGROUP_HIERARCHY=yes UNIFIED_CGROUP_HIERARCHY=yes
do_test "$@" do_test "$@"

View File

@ -14,6 +14,7 @@ PART_UUID="deadbeef-dead-dead-beef-000000000000"
DM_NAME="test24_varcrypt" DM_NAME="test24_varcrypt"
KERNEL_APPEND+=" rd.luks=1 luks.name=$PART_UUID=$DM_NAME luks.key=$PART_UUID=/keyfile:LABEL=varcrypt_keydev" KERNEL_APPEND+=" rd.luks=1 luks.name=$PART_UUID=$DM_NAME luks.key=$PART_UUID=/keyfile:LABEL=varcrypt_keydev"
QEMU_OPTIONS+=" -drive format=raw,cache=unsafe,file=${STATEDIR:?}/keydev.img" QEMU_OPTIONS+=" -drive format=raw,cache=unsafe,file=${STATEDIR:?}/keydev.img"
QEMU_MEM="1024M"
check_result_qemu() { check_result_qemu() {
local ret=1 local ret=1

View File

@ -27,4 +27,6 @@ test_append_files() {
) )
} }
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -8,4 +8,6 @@ TEST_NO_NSPAWN=1
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -9,5 +9,6 @@ TEST_NO_NSPAWN=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_TIMEOUT=300 QEMU_TIMEOUT=300
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -9,5 +9,6 @@ TEST_NO_NSPAWN=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
UNIFIED_CGROUP_HIERARCHY=yes UNIFIED_CGROUP_HIERARCHY=yes
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -8,6 +8,8 @@ TEST_NO_NSPAWN=1
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_MEM="1024M"
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:?} -numa node,memdev=mem0,nodeid=0"
else else

View File

@ -8,4 +8,6 @@ TEST_NO_NSPAWN=1
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -13,6 +13,7 @@ TEST_INSTALL_VERITY_MINIMAL=1
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_TIMEOUT=1200 QEMU_TIMEOUT=1200
QEMU_MEM="1024M"
command -v mksquashfs >/dev/null 2>&1 || exit 0 command -v mksquashfs >/dev/null 2>&1 || exit 0
command -v veritysetup >/dev/null 2>&1 || exit 0 command -v veritysetup >/dev/null 2>&1 || exit 0

View File

@ -10,4 +10,6 @@ QEMU_OPTIONS="-rtc base=$(date -u +%Y-%m-%dT%H:%M:%S -d '+3 days')"
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -8,4 +8,6 @@ TEST_NO_NSPAWN=1
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "$TEST_BASE_DIR/test-functions" . "$TEST_BASE_DIR/test-functions"
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -17,6 +17,8 @@ $KERNEL_APPEND
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_MEM="1024M"
check_result_nspawn() { check_result_nspawn() {
check_result_nspawn_unittests "${1}" check_result_nspawn_unittests "${1}"
} }

View File

@ -8,4 +8,6 @@ TEST_NO_NSPAWN=1
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "$TEST_BASE_DIR/test-functions" . "$TEST_BASE_DIR/test-functions"
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -8,4 +8,6 @@ TEST_NO_NSPAWN=1
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
QEMU_MEM="1024M"
do_test "$@" do_test "$@"

View File

@ -6,6 +6,7 @@ TEST_DESCRIPTION="dm-integrity test"
TEST_NO_NSPAWN=1 TEST_NO_NSPAWN=1
QEMU_TIMEOUT=600 QEMU_TIMEOUT=600
QEMU_MEM="1024M"
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"

View File

@ -36,5 +36,6 @@ tpmstate=$(mktemp -d)
swtpm socket --tpm2 --tpmstate dir="$tpmstate" --ctrl type=unixio,path="$tpmstate/sock" & swtpm socket --tpm2 --tpmstate dir="$tpmstate" --ctrl type=unixio,path="$tpmstate/sock" &
trap 'kill %%; rm -rf $tpmstate' SIGINT EXIT trap 'kill %%; rm -rf $tpmstate' SIGINT EXIT
QEMU_OPTIONS="-chardev socket,id=chrtpm,path=$tpmstate/sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device $tpmdevice,tpmdev=tpm0" QEMU_OPTIONS="-chardev socket,id=chrtpm,path=$tpmstate/sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device $tpmdevice,tpmdev=tpm0"
QEMU_MEM="1024M"
do_test "$@" do_test "$@"