From 5ef41cfc710d8c0d9c7901abc2ede8a999774f8a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 15:20:45 +0000 Subject: [PATCH] tests: Fix platforms.qemu tests for arm64 - Disable tests which use unsupported formats - Enable serial arm64 console for kernel+initrd test Signed-off-by: Rolf Neugebauer --- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.sh | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 37a6569a4..ef397f0a1 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh index 914f12ecf..93e34bafb 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that legacy BIOS ISO boots in qemu -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh index bd57df17b..ea4778169 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that qcow2 image boots in qemu -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh index da2d06b84..ab96960cc 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that raw image boots in qemu -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.sh b/test/cases/010_platforms/000_qemu/050_run_aws/test.sh index 5dbde93f2..f1ee66370 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.sh +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that raw image boots in qemu -# LABELS: +# LABELS: amd64 set -e