[rtems-tools commit] tester: Remove target from BSP coverage configs

[Joel Sherrill]

Module:    rtems-tools
Branch:    master
Commit:    f78ec7ceebc099b120ade4ba857f60f1ec52ef15
Changeset: http://git.rtems.org/rtems-tools/commit/?id=f78ec7ceebc099b120ade4ba857f60f1ec52ef15

Author:    Alex White <alex.white at oarcorp.com>
Date:      Tue Mar  9 13:50:40 2021 -0600

tester: Remove target from BSP coverage configs

---

 tester/rt/coverage.py                        | 3 ++-
 tester/rtems/testing/bsps/griscv-sis-cov.ini | 1 -
 tester/rtems/testing/bsps/leon3-qemu-cov.ini | 1 -
 tester/rtems/testing/bsps/leon3-sis-cov.ini  | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tester/rt/coverage.py b/tester/rt/coverage.py
index 0f225a9..e2a5161 100644
--- a/tester/rt/coverage.py
+++ b/tester/rt/coverage.py
@@ -380,11 +380,12 @@ class coverage_run(object):
         self.no_clean = int(self.macros['_no_clean'])
         self.report_format = self.macros['cov_report_format']
         self.symbol_set = symbol_set
-        self.target = self.macros['target']
+        self.target = self.macros['arch']
         self.bsp_name = self.macros['bsp'].split('-')[0]
         self.prefix = prefix
         self.macros.define('coverage')
         self.covoar_cmd = self.macros.expand(self.macros['bsp_covoar_cmd'])
+        self.covoar_cmd += ' -T ' + self.macros['arch'] + '-rtems' + str(version.version())
 
     def run(self):
         try:
diff --git a/tester/rtems/testing/bsps/griscv-sis-cov.ini b/tester/rtems/testing/bsps/griscv-sis-cov.ini
index 7249af6..9ab37a8 100644
--- a/tester/rtems/testing/bsps/griscv-sis-cov.ini
+++ b/tester/rtems/testing/bsps/griscv-sis-cov.ini
@@ -35,7 +35,6 @@
 bsp            = griscv-sis
 arch           = riscv
 tester         = %{_rtscripts}/run.cfg
-target         = riscv-rtems5
 bsp_run_cmd    = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
 bsp_run_opts   = -nouartrx -r -tlim 300 s -m 4 -cov
 bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM
diff --git a/tester/rtems/testing/bsps/leon3-qemu-cov.ini b/tester/rtems/testing/bsps/leon3-qemu-cov.ini
index 3b183e6..2d319f0 100644
--- a/tester/rtems/testing/bsps/leon3-qemu-cov.ini
+++ b/tester/rtems/testing/bsps/leon3-qemu-cov.ini
@@ -34,7 +34,6 @@
 [leon3-qemu-cov]
 bsp               = leon3-qemu
 arch              = sparc
-target            = sparc-rtems5
 tester            = %{_rtscripts}/qemu.cfg
 bsp_qemu_opts     = %{qemu_opts_base} %{qemu_opts_serial} -M leon3_generic
 bsp_qemu_cov_opts = -exec-trace %{test_executable}.cov
diff --git a/tester/rtems/testing/bsps/leon3-sis-cov.ini b/tester/rtems/testing/bsps/leon3-sis-cov.ini
index 626d314..d8ffe28 100644
--- a/tester/rtems/testing/bsps/leon3-sis-cov.ini
+++ b/tester/rtems/testing/bsps/leon3-sis-cov.ini
@@ -35,7 +35,6 @@
 bsp            = leon3-sis
 arch           = sparc
 tester         = %{_rtscripts}/run.cfg
-target         = sparc-rtems5
 bsp_run_cmd    = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
 bsp_run_opts   = -leon3 -nouartrx -r -tlim 200 s -cov
 bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM