From 5764fba5d693af58a9b5adac374d0828a108ad6a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 12 Jun 2017 10:22:23 +0200 Subject: [PATCH] Only use console=ttyS0 for tests If you also use console=tty0 you lose the output of commands running from the system, as they run on the second console which is discarded. Also drop page-poison as not relevant for tests. Signed-off-by: Justin Cormack --- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- test/cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 7cadc7ec8..2ae906e34 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f 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 35f04c2cd..d6f9dca26 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.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 1e4e411c5..630d5eff1 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 35f04c2cd..d6f9dca26 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index 35f04c2cd..d6f9dca26 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index 35f04c2cd..d6f9dca26 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 0d339e541..9522cde7d 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 35f04c2cd..d6f9dca26 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index f652191c7..165c029d7 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -1,6 +1,6 @@ kernel: image: "linuxkit/kernel:4.9.x" - cmdline: "console=ttyS0 console=tty0 page_poison=1" + cmdline: "console=ttyS0" init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f