On 2020-02-12 18:01, Sebastian Huber wrote:
The realview_pbx_a9_qemu test configuration for Qemu produced no output
due to wrong serial/monitor settings. Remove the serial/monitor
settings from qemu_opts_base and move them to the new qemu_opts_serial.
---
tester/rtems/testing/bsps/generic_or1k.ini | 2 +-
tester/rtems/testing/bsps/leon3-qemu-cov.ini | 2 +-
tester/rtems/testing/bsps/leon3-qemu.ini | 2 +-
tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini | 2 +-
tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini | 2 +-
tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini | 2 +-
tester/rtems/testing/qemu.cfg | 7 ++++---
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/tester/rtems/testing/bsps/generic_or1k.ini
b/tester/rtems/testing/bsps/generic_or1k.ini
index 153d167..9bd139f 100644
--- a/tester/rtems/testing/bsps/generic_or1k.ini
+++ b/tester/rtems/testing/bsps/generic_or1k.ini
@@ -35,4 +35,4 @@
bsp = generic_or1k
arch = or32
tester = %{_rtscripts}/qemu.cfg
-bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -m 32M
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} %{qemu_opts_serial} -m
32M
diff --git a/tester/rtems/testing/bsps/leon3-qemu-cov.ini
b/tester/rtems/testing/bsps/leon3-qemu-cov.ini
index f1cfe55..3b183e6 100644
--- a/tester/rtems/testing/bsps/leon3-qemu-cov.ini
+++ b/tester/rtems/testing/bsps/leon3-qemu-cov.ini
@@ -36,6 +36,6 @@ bsp = leon3-qemu
arch = sparc
target = sparc-rtems5
tester = %{_rtscripts}/qemu.cfg
-bsp_qemu_opts = %{qemu_opts_base} -M leon3_generic
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_serial} -M leon3_generic
bsp_qemu_cov_opts = -exec-trace %{test_executable}.cov
bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations}
diff --git a/tester/rtems/testing/bsps/leon3-qemu.ini
b/tester/rtems/testing/bsps/leon3-qemu.ini
index 9e8854c..957b1e4 100644
--- a/tester/rtems/testing/bsps/leon3-qemu.ini
+++ b/tester/rtems/testing/bsps/leon3-qemu.ini
@@ -35,4 +35,4 @@
bsp = leon3-qemu
arch = sparc
tester = %{_rtscripts}/qemu.cfg
-bsp_qemu_opts = %{qemu_opts_base} -M leon3_generic
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_serial} -M leon3_generic
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
index 6fba113..a7bb952 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
@@ -35,4 +35,4 @@
bsp = xilinx_zynq_a9_qemu
arch = arm
tester = %{_rtscripts}/qemu.cfg
-bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 256M
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} %{qemu_opts_serial} -M
xilinx-zynq-a9 -m 256M
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
index f49d381..4366ffc 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
@@ -36,4 +36,4 @@ bsp = xilinx_zynq_a9_qemu
arch = arm
jobs = half
tester = %{_rtscripts}/qemu.cfg
-bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m
256M -smp cpus=2
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} %{qemu_opts_serial} -M
xilinx-zynq-a9 -m 256M -smp cpus=2
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
index 7abc34e..dc635ae 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
@@ -35,4 +35,4 @@
bsp = xilinx_zynq_zc706
arch = arm
tester = %{_rtscripts}/qemu.cfg
-bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m
1024M
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} %{qemu_opts_serial} -M
xilinx-zynq-a9 -m 1024M
diff --git a/tester/rtems/testing/qemu.cfg b/tester/rtems/testing/qemu.cfg
index b23be4b..24026dd 100644
--- a/tester/rtems/testing/qemu.cfg
+++ b/tester/rtems/testing/qemu.cfg
@@ -58,12 +58,13 @@
#
# Qemu common option patterns.
#
+%define qemu_opts_base -no-reboot -nographic
+%define qemu_opts_no_net -net none
%if %{defined qemu_use_serial_console}
- %define qemu_opts_base -no-reboot -monitor none -serial stdio -nographic
+ %define qemu_opts_serial -monitor none -serial stdio
%else
- %define qemu_opts_base -no-reboot -serial null -serial mon:stdio -nographic
+ %define qemu_opts_serial -serial null -serial mon:stdio
%endif
I must be must be mising what has changed. I cannot see the "wrong
options that have changed?
-%define qemu_opts_no_net -net none
Why move?
Chris
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
