rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 07:15:41 +00:00
Code Issues Releases Wiki Activity

allow tester to over-ride the vm's memory limit

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-01-22 13:14:31 +10:00
parent 353fa604ab
commit 3a7096f19b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -34,6 +34,9 @@ shell-bind: .dapper
clean: clean:
@./scripts/clean @./scripts/clean
itest:
./.dapper integration-test 2>&1 | tee dist/itest.log
help: help:
@./scripts/help @./scripts/help

10
scripts/run
View File

@@ -6,6 +6,8 @@ cd $(dirname $0)/..
source ./scripts/run-common source ./scripts/run-common
MEMORY=2048
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
case $1 in case $1 in
--iso) --iso)
@@ -24,6 +26,10 @@ while [ "$#" -gt 0 ]; do
shift 1 shift 1
QEMU_APPEND="${QEMU_APPEND} $1" QEMU_APPEND="${QEMU_APPEND} $1"
;; ;;
--memory)
shift 1
MEMORY="$1"
;;
--name) --name)
shift 1 shift 1
NAME="$1" NAME="$1"
@@ -182,7 +188,7 @@ if [ "$QEMU" == "1" ]; then
${KVM_ENABLE} \ ${KVM_ENABLE} \
${CPU} \ ${CPU} \
${machine["$ARCH"]} \ ${machine["$ARCH"]} \
-m 2048 \ -m $MEMORY \
${network["$ARCH"]} \ ${network["$ARCH"]} \
$(eval "${hd["$ARCH"]} ${HD}") \ $(eval "${hd["$ARCH"]} ${HD}") \
${SECOND_DRIVE_ENABLE} \ ${SECOND_DRIVE_ENABLE} \
@@ -211,7 +217,7 @@ elif [ "$BOOT_ISO" == "1" ] ||
${KVM_ENABLE} \ ${KVM_ENABLE} \
${CPU} \ ${CPU} \
${machine["$ARCH"]} \ ${machine["$ARCH"]} \
-m 2048 \ -m MEMORY \
${network["$ARCH"]} \ ${network["$ARCH"]} \
$(eval "${hd["$ARCH"]} ${HD}") \ $(eval "${hd["$ARCH"]} ${HD}") \
${SECOND_DRIVE_ENABLE} \ ${SECOND_DRIVE_ENABLE} \