diff options
Diffstat (limited to 'tester/rtems')
24 files changed, 140 insertions, 70 deletions
diff --git a/tester/rtems/testing/bsps/erc32-sis.ini b/tester/rtems/testing/bsps/erc32-sis.ini index fca2122..a025265 100644 --- a/tester/rtems/testing/bsps/erc32-sis.ini +++ b/tester/rtems/testing/bsps/erc32-sis.ini @@ -34,6 +34,5 @@ [erc32-sis] bsp = erc32 arch = sparc -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis -bsp_run_opts = -nouartrx -r -tlim 600 s +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = diff --git a/tester/rtems/testing/bsps/gr740-sis.ini b/tester/rtems/testing/bsps/gr740-sis.ini index b71048c..c42d716 100644 --- a/tester/rtems/testing/bsps/gr740-sis.ini +++ b/tester/rtems/testing/bsps/gr740-sis.ini @@ -33,6 +33,5 @@ [gr740-sis] bsp = gr740 arch = sparc -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis -bsp_run_opts = -gr740 -nouartrx -r -tlim 200 s -m 4 +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = -gr740 -m 4 diff --git a/tester/rtems/testing/bsps/griscv-sis-cov.ini b/tester/rtems/testing/bsps/griscv-sis-cov.ini index 9ab37a8..fa86b55 100644 --- a/tester/rtems/testing/bsps/griscv-sis-cov.ini +++ b/tester/rtems/testing/bsps/griscv-sis-cov.ini @@ -34,7 +34,6 @@ [griscv-sis-cov] bsp = griscv-sis arch = riscv -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis -bsp_run_opts = -nouartrx -r -tlim 300 s -m 4 -cov +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = -m 4 -cov bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM diff --git a/tester/rtems/testing/bsps/griscv-sis.ini b/tester/rtems/testing/bsps/griscv-sis.ini index b21cba1..bf32851 100644 --- a/tester/rtems/testing/bsps/griscv-sis.ini +++ b/tester/rtems/testing/bsps/griscv-sis.ini @@ -34,6 +34,5 @@ [griscv-sis] bsp = griscv arch = riscv -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis -bsp_run_opts = -nouartrx -r -tlim 300 s -m 4 +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = -m 4 diff --git a/tester/rtems/testing/bsps/imx7.ini b/tester/rtems/testing/bsps/imx7.ini index 0a56ba8..c16bc6c 100644 --- a/tester/rtems/testing/bsps/imx7.ini +++ b/tester/rtems/testing/bsps/imx7.ini @@ -38,5 +38,5 @@ arch = arm jobs = 1 tester = %{_rtscripts}/tftp.cfg test_restarts = 3 -target_start_regex = Hit any key to stop autoboot: +target_start_regex = .*U-Boot .* requires = bsp_tty_dev diff --git a/tester/rtems/testing/bsps/leon2-sis.ini b/tester/rtems/testing/bsps/leon2-sis.ini index 61205ad..810320c 100644 --- a/tester/rtems/testing/bsps/leon2-sis.ini +++ b/tester/rtems/testing/bsps/leon2-sis.ini @@ -34,6 +34,5 @@ [leon2-sis] bsp = leon2 arch = sparc -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis -bsp_run_opts = -leon2 -nouartrx -r -tlim 200 s +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = -leon2 diff --git a/tester/rtems/testing/bsps/leon3-run.ini b/tester/rtems/testing/bsps/leon3-run.ini index a8c97a6..99c391b 100644 --- a/tester/rtems/testing/bsps/leon3-run.ini +++ b/tester/rtems/testing/bsps/leon3-run.ini @@ -34,6 +34,5 @@ [leon3-run] bsp = leon3 arch = sparc -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run +tester = %{_rtscripts}/sis.cfg bsp_run_opts = -a -leon3 diff --git a/tester/rtems/testing/bsps/leon3-sis-cov.ini b/tester/rtems/testing/bsps/leon3-sis-cov.ini index d8ffe28..7c6a279 100644 --- a/tester/rtems/testing/bsps/leon3-sis-cov.ini +++ b/tester/rtems/testing/bsps/leon3-sis-cov.ini @@ -34,7 +34,6 @@ [leon3-sis-cov] bsp = leon3-sis arch = sparc -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis -bsp_run_opts = -leon3 -nouartrx -r -tlim 200 s -cov +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = -leon3 -cov bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM diff --git a/tester/rtems/testing/bsps/leon3-sis.ini b/tester/rtems/testing/bsps/leon3-sis.ini index 2f933a7..9035f48 100644 --- a/tester/rtems/testing/bsps/leon3-sis.ini +++ b/tester/rtems/testing/bsps/leon3-sis.ini @@ -34,6 +34,5 @@ [leon3-sis] bsp = leon3 arch = sparc -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis -bsp_run_opts = -leon3 -nouartrx -r -tlim 200 s -m 4 +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = -leon3 -m 4 diff --git a/tester/rtems/testing/bsps/qoriq_e500.ini b/tester/rtems/testing/bsps/qoriq_e500.ini index 322069b..995b6e8 100644 --- a/tester/rtems/testing/bsps/qoriq_e500.ini +++ b/tester/rtems/testing/bsps/qoriq_e500.ini @@ -38,5 +38,5 @@ arch = powerpc jobs = 1 tester = %{_rtscripts}/tftp.cfg test_restarts = 3 -target_start_regex = U-Boot +target_start_regex = .*U-Boot .* requires = bsp_tty_dev diff --git a/tester/rtems/testing/bsps/qoriq_e6500_32.ini b/tester/rtems/testing/bsps/qoriq_e6500_32.ini index 26ee3ae..37feac4 100644 --- a/tester/rtems/testing/bsps/qoriq_e6500_32.ini +++ b/tester/rtems/testing/bsps/qoriq_e6500_32.ini @@ -39,5 +39,5 @@ arch = powerpc jobs = 1 tester = %{_rtscripts}/tftp.cfg test_restarts = 3 -target_start_regex = U-Boot +target_start_regex = .*U-Boot .* requires = bsp_tty_dev diff --git a/tester/rtems/testing/bsps/qoriq_e6500_64.ini b/tester/rtems/testing/bsps/qoriq_e6500_64.ini index c9b6ab7..6e2e0b2 100644 --- a/tester/rtems/testing/bsps/qoriq_e6500_64.ini +++ b/tester/rtems/testing/bsps/qoriq_e6500_64.ini @@ -39,5 +39,5 @@ arch = powerpc jobs = 1 tester = %{_rtscripts}/tftp.cfg test_restarts = 3 -target_start_regex = U-Boot +target_start_regex = .*U-Boot .* requires = bsp_tty_dev diff --git a/tester/rtems/testing/bsps/rv64imac_medany_spike.ini b/tester/rtems/testing/bsps/rv32i.ini index 1d9a522..1817216 100644 --- a/tester/rtems/testing/bsps/rv64imac_medany_spike.ini +++ b/tester/rtems/testing/bsps/rv32i.ini @@ -1,6 +1,7 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2010-2014 Chris Johns (chrisj@rtems.org) +# Copyright 2020 Hesham Almatary +# Copyright 2018 embedded brains GmbH # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -28,11 +29,9 @@ # POSSIBILITY OF SUCH DAMAGE. # -# -# The Generic RISC-V BSP -# -[rv64imac_medany_spike] -bsp = rv64imac -arch = riscv64 -tester = %{_rtscripts}/spike.cfg -bsp_spike_opts = --isa=RV64IMAC +[rv32i] +bsp = rv32i +arch = riscv32 +tester = %{_rtscripts}/qemu.cfg +bsp_qemu_image_type = -bios +bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M diff --git a/tester/rtems/testing/bsps/rv64imafd_medany_spike.ini b/tester/rtems/testing/bsps/rv32imafdc.ini index 9348131..2f91a9a 100644 --- a/tester/rtems/testing/bsps/rv64imafd_medany_spike.ini +++ b/tester/rtems/testing/bsps/rv32imafdc.ini @@ -1,6 +1,7 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2010-2014 Chris Johns (chrisj@rtems.org) +# Copyright 2020 Hesham Almatary +# Copyright 2018 embedded brains GmbH # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -28,11 +29,9 @@ # POSSIBILITY OF SUCH DAMAGE. # -# -# The Generic RISC-V BSP -# -[rv64imafd_medany_spike] -bsp = rv64imafd -arch = riscv64 -tester = %{_rtscripts}/spike.cfg -bsp_spike_opts = --isa=RV64IMAFD +[rv32imafdc] +bsp = rv32imafdc +arch = riscv32 +tester = %{_rtscripts}/qemu.cfg +bsp_qemu_image_type = -bios +bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M diff --git a/tester/rtems/testing/bsps/rv64imac_spike.ini b/tester/rtems/testing/bsps/rv64imac_spike.ini index b2a35fd..10900d8 100644 --- a/tester/rtems/testing/bsps/rv64imac_spike.ini +++ b/tester/rtems/testing/bsps/rv64imac_spike.ini @@ -35,4 +35,4 @@ bsp = rv64imac arch = riscv64 tester = %{_rtscripts}/spike.cfg -bsp_spike_opts = --isa=RV64IMAC -m0x70000000:0x10000000 +bsp_spike_opts = --isa=RV64IMAC diff --git a/tester/rtems/testing/bsps/rv64imafd_medany.ini b/tester/rtems/testing/bsps/rv64imafd.ini index 15137df..bbb4ee3 100644 --- a/tester/rtems/testing/bsps/rv64imafd_medany.ini +++ b/tester/rtems/testing/bsps/rv64imafd.ini @@ -28,8 +28,9 @@ # POSSIBILITY OF SUCH DAMAGE. # -[rv64imafd_medany] -bsp = rv64imafd_medany +[rv64imafd] +bsp = rv64imafd arch = riscv64 tester = %{_rtscripts}/qemu.cfg -bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 64M +bsp_qemu_image_type = -bios +bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M diff --git a/tester/rtems/testing/bsps/rv64imafd_spike.ini b/tester/rtems/testing/bsps/rv64imafd_spike.ini index 74336aa..8e975f7 100644 --- a/tester/rtems/testing/bsps/rv64imafd_spike.ini +++ b/tester/rtems/testing/bsps/rv64imafd_spike.ini @@ -35,4 +35,4 @@ bsp = rv64imafd arch = riscv64 tester = %{_rtscripts}/spike.cfg -bsp_spike_opts = --isa=RV64IMAFD -m0x70000000:0x10000000 +bsp_spike_opts = --isa=RV64IMAFD diff --git a/tester/rtems/testing/bsps/rv64imafdc_medany.ini b/tester/rtems/testing/bsps/rv64imafdc.ini index 30abd50..d42680b 100644 --- a/tester/rtems/testing/bsps/rv64imafdc_medany.ini +++ b/tester/rtems/testing/bsps/rv64imafdc.ini @@ -29,8 +29,9 @@ # POSSIBILITY OF SUCH DAMAGE. # -[rv64imafdc_medany] -bsp = rv64imafdc_medany +[rv64imafdc] +bsp = rv64imafdc arch = riscv64 tester = %{_rtscripts}/qemu.cfg -bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 64M +bsp_qemu_image_type = -bios +bsp_qemu_opts = -no-reboot -nographic %{qemu_opts_no_net} -machine virt -m 128M diff --git a/tester/rtems/testing/bsps/rv64imafdc_spike.ini b/tester/rtems/testing/bsps/rv64imafdc_spike.ini index b72b471..c95a840 100644 --- a/tester/rtems/testing/bsps/rv64imafdc_spike.ini +++ b/tester/rtems/testing/bsps/rv64imafdc_spike.ini @@ -35,4 +35,4 @@ bsp = rv64imafdc arch = riscv64 tester = %{_rtscripts}/spike.cfg -bsp_spike_opts = --isa=RV64IMAFDC -m0x70000000:0x10000000 +bsp_spike_opts = --isa=RV64IMAFDC diff --git a/tester/rtems/testing/bsps/sis-run.ini b/tester/rtems/testing/bsps/sis-run.ini index 55c30ac..4861231 100644 --- a/tester/rtems/testing/bsps/sis-run.ini +++ b/tester/rtems/testing/bsps/sis-run.ini @@ -34,6 +34,5 @@ [sis-run] bsp = sis arch = sparc -tester = %{_rtscripts}/run.cfg -bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run -bsp_run_opts = -a -nouartrx +tester = %{_rtscripts}/sis.cfg +bsp_run_opts = diff --git a/tester/rtems/testing/bsps/sis.ini b/tester/rtems/testing/bsps/sis.ini index b5d700f..086cb45 100644 --- a/tester/rtems/testing/bsps/sis.ini +++ b/tester/rtems/testing/bsps/sis.ini @@ -34,8 +34,6 @@ [sis] bsp = sis arch = sparc -tester = %{_rtscripts}/gdb.cfg +tester = %{_rtscripts}/sis.cfg gdb_script = bsp_gdb_script -bsp_gdb_script = target sim -a -nouartrx - load - run +bsp_run_opts = diff --git a/tester/rtems/testing/bsps/rv64imafdc_medany_spike.ini b/tester/rtems/testing/bsps/stm32h7-stlink.ini index b691a60..2c375f5 100644 --- a/tester/rtems/testing/bsps/rv64imafdc_medany_spike.ini +++ b/tester/rtems/testing/bsps/stm32h7-stlink.ini @@ -1,6 +1,6 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2010-2014 Chris Johns (chrisj@rtems.org) +# Copyright 2015 On-Line Applications Research Corporation (OAR). # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -29,10 +29,16 @@ # # -# The Generic RISC-V BSP -# -[rv64imafdc_medany_spike] -bsp = rv64imafdc_medany -arch = riscv64 -tester = %{_rtscripts}/spike.cfg -bsp_spike_opts = --isa=RV64IMAFDC +# The stm32h7 BSP family +# +[stm32h7-stlink] +bsp = stm32h7-stlink +arch = arm +tester = %{_rtscripts}/gdb.cfg +jobs = 1 +gdb_script = bsp_gdb_script +requires = bsp_tty_dev, bsp_gdb_script, target_pretest_command, target_posttest_command +bsp_gdb_script = target extended-remote :61234 + load + handle SIGTRAP nostop + cont diff --git a/tester/rtems/testing/qemu.cfg b/tester/rtems/testing/qemu.cfg index 3c51bee..0b592ef 100644 --- a/tester/rtems/testing/qemu.cfg +++ b/tester/rtems/testing/qemu.cfg @@ -78,6 +78,9 @@ %ifn %{defined bsp_qemu_extra_opts} %define bsp_qemu_extra_opts %{nil} %endif +%ifn %{defined bsp_qemu_image_type} + %define bsp_qemu_image_type -kernel +%endif %define qemu_cmd qemu-system-%{bsp_arch} %define qemu_opts %{bsp_qemu_opts} %{bsp_qemu_cov_opts} @@ -85,4 +88,4 @@ # # Executable # -%execute %{qemu_cmd} %{qemu_opts} %{bsp_qemu_extra_opts} -kernel %{test_executable} +%execute %{qemu_cmd} %{qemu_opts} %{bsp_qemu_extra_opts} %{bsp_qemu_image_type} %{test_executable} diff --git a/tester/rtems/testing/sis.cfg b/tester/rtems/testing/sis.cfg new file mode 100644 index 0000000..bb8d0bc --- /dev/null +++ b/tester/rtems/testing/sis.cfg @@ -0,0 +1,72 @@ +# +# RTEMS Tools Project (http://www.rtems.org/) +# Copyright 2022 Chris Johns (chrisj@rtems.org) +# All rights reserved. +# +# This file is part of the RTEMS Tools package in 'rtems-tools'. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +# +# SIS. The main simulator for SPARC/LEON +# +# Use sis command to run the executable in the spike simulator. +# + +%include %{_configdir}/base.cfg +%include %{_configdir}/checks.cfg + +# +# Console. +# +%define console_stdio +%include %{_configdir}/console.cfg + +# +# RTEMS version +# +%include %{_rtdir}/rtems/version.cfg + +# +# Timeout option. This is the default for timeout for the CPU realtime +# clock + +%ifn %{defined sis_time_limit} + %define sis_time_limit -tlim 400 s +%endif + +# +# Default command +# +%ifn %{defined bsp_run_cmd} + %define bsp_run_cmd %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis +%endif + +%define sis_cmd %{bsp_run_cmd} +%define sis_opts -nouartrx -r %{sis_time_limit} %{bsp_run_opts} + +# +# Executable +# +%execute %{sis_cmd} %{sis_opts} %{test_executable} |