From 3a7096f19bd9f43543f565a0c4ad252785adabca Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Sun, 22 Jan 2017 13:14:31 +1000 Subject: [PATCH] allow tester to over-ride the vm's memory limit Signed-off-by: Sven Dowideit --- Makefile | 3 +++ scripts/run | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9198eb34..11f94d4e 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,9 @@ shell-bind: .dapper clean: @./scripts/clean +itest: + ./.dapper integration-test 2>&1 | tee dist/itest.log + help: @./scripts/help diff --git a/scripts/run b/scripts/run index 0497c61d..1eaeb9e5 100755 --- a/scripts/run +++ b/scripts/run @@ -6,6 +6,8 @@ cd $(dirname $0)/.. source ./scripts/run-common +MEMORY=2048 + while [ "$#" -gt 0 ]; do case $1 in --iso) @@ -24,6 +26,10 @@ while [ "$#" -gt 0 ]; do shift 1 QEMU_APPEND="${QEMU_APPEND} $1" ;; + --memory) + shift 1 + MEMORY="$1" + ;; --name) shift 1 NAME="$1" @@ -182,7 +188,7 @@ if [ "$QEMU" == "1" ]; then ${KVM_ENABLE} \ ${CPU} \ ${machine["$ARCH"]} \ - -m 2048 \ + -m $MEMORY \ ${network["$ARCH"]} \ $(eval "${hd["$ARCH"]} ${HD}") \ ${SECOND_DRIVE_ENABLE} \ @@ -211,7 +217,7 @@ elif [ "$BOOT_ISO" == "1" ] || ${KVM_ENABLE} \ ${CPU} \ ${machine["$ARCH"]} \ - -m 2048 \ + -m MEMORY \ ${network["$ARCH"]} \ $(eval "${hd["$ARCH"]} ${HD}") \ ${SECOND_DRIVE_ENABLE} \