diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2016-11-02 13:04:42 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2016-11-02 13:08:30 +0000 |
| commit | 56851807b708a31215dd255c05e918645df10686 (patch) | |
| tree | a5deafc0c9e14ff8480fe5f76ab8a7428077173d | |
| parent | 58d6cfb7ae5791a2ae6ccd387df3e095add70f89 (diff) | |
fix up system testqemu-tests-cleanup
Change-Id: I90871449d1f2b97b0d63dc1bc116c455ce334ad5
| -rw-r--r-- | ubuntu/qemu-system-test.yaml | 5 | ||||
| -rwxr-xr-x | ubuntu/scripts/qemu-system-tests.sh | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ubuntu/qemu-system-test.yaml b/ubuntu/qemu-system-test.yaml index 43a7225..f2afedd 100644 --- a/ubuntu/qemu-system-test.yaml +++ b/ubuntu/qemu-system-test.yaml @@ -19,7 +19,8 @@ params: # The QEMU executable QEMU_BIN: /usr/local/bin/qemu-system-aarch64 # The QEMU machine definitions - QEMU_ARGS: -machine virt -cpu cortex-a57 -machine type=virt -nographic -smp 1 -m 396 + QEMU_MACHINE: virt + QEMU_ARGS: -cpu cortex-a57 -nographic -smp 1 -m 396 # The arguments passed to the kernel KERNEL_ARGS: console=ttyAMA0 @@ -34,5 +35,5 @@ install: run: steps: - - export QEMU_BIN QEMU_ARGS KERNEL_ARGS IMAGE + - export QEMU_BIN QEMU_MACHINE QEMU_ARGS KERNEL_ARGS IMAGE - ubuntu/scripts/qemu-system-tests.sh ${TESTS} diff --git a/ubuntu/scripts/qemu-system-tests.sh b/ubuntu/scripts/qemu-system-tests.sh index e0b1615..b681699 100755 --- a/ubuntu/scripts/qemu-system-tests.sh +++ b/ubuntu/scripts/qemu-system-tests.sh @@ -5,6 +5,7 @@ # This expects the follow environment variables to be set: # QEMU_BIN - path to binary # QEMU_ARGS - arguments to run +# QEMU_MACHINE - machine type # KERNEL_ARGS - arguments to kernel # IMAGE - URL to image # @@ -20,7 +21,11 @@ popd > /dev/null IMAGE_FILE=${IMAGE##*/} IMAGE_NAME=${IMAGE_FILE%.*} +: ${KERNEL_IMAGE}=/home/image + for test in $@; do - lava-test-case qemu-${test}-${IMAGE_NAME} --shell ${BASE}/qemu-${test}.expect ${QEMU_BIN} ${QEMU_ARGS} -kernel /home/image -append "${KERNEL_ARGS}" + lava-test-case qemu-${test}-${QEMU_MACHINE}-${IMAGE_NAME} \ + --shell ${BASE}/qemu-${test}.expect ${QEMU_BIN} ${QEMU_ARGS} -machine type=${QEMU_MACHINE} \ + -kernel ${KERNEL_IMAGE} -append "${KERNEL_ARGS}" done |