Merge pull request #1541 from SvenDowideit/run-memory-arg

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

Makefile

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

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} \