[rtems-tools commit] tester : Add support to use QEMU serial console when coverage is enabled

[Sebastian Huber]

This commit breaks Qemu test runs for me:

error: qemu.cfg:84: execute failed: qemu-system-riscv64 -no-reboot 
-nographic -net none -machine virt -m 64M -kernel 
/build/git-build/b-rv64imafd_medany/riscv-rtems5/c/rv64imafd_medany/testsuites/smptests/smppsxsignal01.exe: 
exit-code:1
error: qemu.cfg:84: execute failed: qemu-system-riscv64 -no-reboot 
-nographic -net none -machine virt -m 64M -kernel 
/build/git-build/b-rv64imafd_medany/riscv-rtems5/c/rv64imafd_medany/testsuites/smptests/smppsxsignal01.exe: 
exit-code:1
warning: switched to dry run due to errors
warning: unknown directive: '%ifdef'
warning: invalid format: '%ifdef coverag'
warning: unexpected '%endif'

On 02/12/2018 04:41, Chris Johns wrote:
> Module:    rtems-tools
> Branch:    master
> Commit:    650569cfc5566fdc63e3679e999d7a11bcbef501
> Changeset: http://git.rtems.org/rtems-tools/commit/?id=650569cfc5566fdc63e3679e999d7a11bcbef501
>
> Author:    Vijay Kumar Banerjee <vijaykumar9597 at gmail.com>
> Date:      Tue Nov 27 13:43:08 2018 +0530
>
> tester : Add support to use QEMU serial console when coverage is enabled
>
> ---
>
>   tester/rt/coverage.py         |  1 +
>   tester/rtems/testing/qemu.cfg | 17 ++++++++++-------
>   2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/tester/rt/coverage.py b/tester/rt/coverage.py
> index 9ff27ad..9fc9b64 100644
> --- a/tester/rt/coverage.py
> +++ b/tester/rt/coverage.py
> @@ -363,6 +363,7 @@ class coverage_run(object):
>           self.target = self.macros['target']
>           self.bsp_name = self.macros['bsp'].split('-')[0]
>           self.prefix = prefix
> +        self.macros.define('coverage')
>   
>       def run(self):
>           try:
> diff --git a/tester/rtems/testing/qemu.cfg b/tester/rtems/testing/qemu.cfg
> index e37dc9b..d0c6ac7 100644
> --- a/tester/rtems/testing/qemu.cfg
> +++ b/tester/rtems/testing/qemu.cfg
> @@ -49,6 +49,16 @@
>   %include %{_rtdir}/rtems/version.cfg
>   
>   #
> +# Coverage, some builds of qemu support coverage.
> +#
> +%ifdef coverage
> + %define qemu_use_serial_console
> + %ifn %{defined bsp_qemu_cov_opts}
> +  %define bsp_qemu_cov_opts %{nil}
> + %endif
> +%endif
> +
> +#
>   # Qemu common option patterns.
>   #
>   %if %{defined qemu_use_serial_console}
> @@ -59,13 +69,6 @@
>   %define qemu_opts_no_net -net none
>   
>   #
> -# Coverage, some builds of qemu support coverage.
> -#
> -%ifn %{defined bsp_qemu_cov_opts}
> - %define bsp_qemu_cov_opts %{nil}
> -%endif
> -
> -#
>   # Qemu executable
>   #
>   %ifn %{defined bsp_qemu_opts}
>
> _______________________________________________
> vc mailing list
> vc at rtems.org
> http://lists.rtems.org/mailman/listinfo/vc

-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber at embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.