<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Mar 2, 2021 at 9:46 AM Gedare Bloom <<a href="mailto:gedare@rtems.org">gedare@rtems.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Mon, Mar 1, 2021 at 1:01 PM Alex White <<a href="mailto:alexanderjwhite@gmail.com" target="_blank">alexanderjwhite@gmail.com</a>> wrote:<br>
><br>
> The tester configurations had not been updated to match the paths and<br>
> conventions used by the new build system. These have been updated,<br>
> and a few more libraries have been enabled in symbol-sets.ini.<br>
> ---<br>
> tester/rtems/testing/bsps/griscv-sis-cov.ini | 4 +-<br>
> tester/rtems/testing/bsps/leon3-qemu-cov.ini | 4 +-<br>
> tester/rtems/testing/bsps/leon3-sis-cov.ini | 4 +-<br>
> tester/rtems/testing/coverage/symbol-sets.ini | 91 ++++++++++---------<br>
> 4 files changed, 52 insertions(+), 51 deletions(-)<br>
><br>
> diff --git a/tester/rtems/testing/bsps/griscv-sis-cov.ini b/tester/rtems/testing/bsps/griscv-sis-cov.ini<br>
> index 7249af6..e8de95f 100644<br>
> --- a/tester/rtems/testing/bsps/griscv-sis-cov.ini<br>
> +++ b/tester/rtems/testing/bsps/griscv-sis-cov.ini<br>
> @@ -35,7 +35,7 @@<br>
> bsp = griscv-sis<br>
> arch = riscv<br>
> tester = %{_rtscripts}/run.cfg<br>
> -target = riscv-rtems5<br>
> +target = riscv<br>
These are the only ini files that define this target? With this<br>
change, target is same as arch. Is target needed? I can't immediately<br>
tell where it gets used later? 'target' is usually understood as the<br>
binutil/gcc target triplet, so if the triplet is not being used, the<br>
variable should be less misleading. covoar_target might be better if<br>
this variable is needed in covar? I don't see it in any other<br>
non-coverage ini files though, so maybe it is not needed at all?<br></blockquote><div><br></div><div>covoar originally used nm, addr2line, and objdump. This has been reduced to</div><div>objdump but it needs the target name to be able to invoke that. At this point,</div><div>the target has to be provided or covoar has to have rtems6 hard-coded and</div><div>add rtems6 to the architecture. </div><div><br></div><div>Is there a variable in the tester to set this to?</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
> bsp_run_opts = -nouartrx -r -tlim 300 s -m 4 -cov<br>
> -bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM<br>
> +bsp_covoar_cmd = -T riscv-rtems6 -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM<br>
<br>
what about:<br>
-T %{arch}-rtems%{rtems_version}<br>
<br>
We should be limiting hard-coding version numbers.<br></blockquote><div><br></div><div>If that works, I would be happy.</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> diff --git a/tester/rtems/testing/bsps/leon3-qemu-cov.ini b/tester/rtems/testing/bsps/leon3-qemu-cov.ini<br>
> index 3b183e6..3d558db 100644<br>
> --- a/tester/rtems/testing/bsps/leon3-qemu-cov.ini<br>
> +++ b/tester/rtems/testing/bsps/leon3-qemu-cov.ini<br>
> @@ -34,8 +34,8 @@<br>
> [leon3-qemu-cov]<br>
> bsp = leon3-qemu<br>
> arch = sparc<br>
> -target = sparc-rtems5<br>
> +target = sparc<br>
> tester = %{_rtscripts}/qemu.cfg<br>
> bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_serial} -M leon3_generic<br>
> bsp_qemu_cov_opts = -exec-trace %{test_executable}.cov<br>
> -bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations}<br>
> +bsp_covoar_cmd = -T sparc-rtems6 -S %{bsp_symbol_path} -E %{cov_explanations}<br>
> diff --git a/tester/rtems/testing/bsps/leon3-sis-cov.ini b/tester/rtems/testing/bsps/leon3-sis-cov.ini<br>
> index 626d314..66dae87 100644<br>
> --- a/tester/rtems/testing/bsps/leon3-sis-cov.ini<br>
> +++ b/tester/rtems/testing/bsps/leon3-sis-cov.ini<br>
> @@ -35,7 +35,7 @@<br>
> bsp = leon3-sis<br>
> arch = sparc<br>
> tester = %{_rtscripts}/run.cfg<br>
> -target = sparc-rtems5<br>
> +target = sparc<br>
> bsp_run_cmd = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis<br>
> bsp_run_opts = -leon3 -nouartrx -r -tlim 200 s -cov<br>
> -bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM<br>
> +bsp_covoar_cmd = -T sparc-rtems6 -S %{bsp_symbol_path} -E %{cov_explanations} -f TSIM<br>
> diff --git a/tester/rtems/testing/coverage/symbol-sets.ini b/tester/rtems/testing/coverage/symbol-sets.ini<br>
> index 8f85533..9617dd8 100644<br>
> --- a/tester/rtems/testing/coverage/symbol-sets.ini<br>
> +++ b/tester/rtems/testing/coverage/symbol-sets.ini<br>
> @@ -29,50 +29,51 @@<br>
> #<br>
><br>
> [symbol-sets]<br>
> -sets = score,rtems,sapi,libdl,posix,librfs,libdosfs,libdevfs,libimfs,libbspcmdline,libcpuuse,libstackchk,libfsmount,libstringto,libdevnull,libdumpbuf,libblock<br>
> +sets = score,rtems,sapi,posix,librfs,libpipe,libdosfs,libimfs,libjffs2,libcsupport,libbspcmdline,libcpuuse,libstackchk,libfsmount,libstringto,libdevnull,libdumpbuf,libuntar,libblock,libcrypt,libmd,libstdthreads<br>
><br>
> [libraries]<br>
> -score = @BUILD-TARGET@/c/@BSP@/cpukit/score/src<br>
> -rtems = @BUILD-TARGET@/c/@BSP@/cpukit/rtems/src<br>
> -sapi = @BUILD-TARGET@/c/@BSP@/cpukit/sapi/src<br>
> -libdl = @BUILD-TARGET@/c/@BSP@/cpukit/libdl<br>
> -posix = @BUILD-TARGET@/c/@BSP@/cpukit/posix/src<br>
> -librfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/rfs<br>
> -libdosfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/dosfs<br>
> -libdevfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/devfs<br>
> -libimfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/imfs<br>
> -#libdefaultsfs = @BUiLD-TARGET@/c/@BSP@/cpukit/libfs<br>
> -#libjffs2 = @BUILD-TARGET@/c/@BSP@/cpukit/libfs<br>
> -#dtc = @BUILD-TARGET@/c/@BSP@/cpukit/libfdt<br>
> -#libdrvmgr = @BUILD-TARGET@/c/@BSP@/cpukit/libdrvmgr<br>
> -#libi2c = @BUILD-TARGET@/c/@BSP@/cpukit/libi2c<br>
> -#libcsupport = @BUILD-TARGET@/c/@BSP@/cpukit/libcsupport/src<br>
> -libbspcmdline = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/bspcmdline<br>
> -libcpuuse = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/cpuuse<br>
> -libstackchk = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/stackchk<br>
> -libfsmount = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/fsmount<br>
> -libstringto = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/stringto<br>
> -libdevnull = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/devnull<br>
> -libdumpbuf = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/dumpbuf<br>
> -#libcapture = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libdummy = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libmonitor = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libmouse = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libmw-fb = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libredirector = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#librtemsfdt = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libserdbg = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libshell = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libtestsupport= @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libuntar = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libutf8proc = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libuuid = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -#libxz = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc<br>
> -libblock = @BUILD-TARGET@/c/@BSP@/cpukit/libblock/src<br>
> -#libpci = @BUILD-TARGET@/c/@BSP@/cpukit/libpci<br>
> -#librpc = @BUILD-TARGET@/c/@BSP@/cpukit/librpc<br>
> -#libxdr = @BUILD-TARGET@/c/@BSP@/cpukit/librpc<br>
> -#libcrypt = @BUILD-TARGET@/c/@BSP@/cpukit/libcrypt<br>
> -#libmd = @BUILD-TARGET@/c/@BSP@/cpukit/libmd<br>
> -#libstdthreads = @BUILD-TARGET@/c/@BSP@/cpukit/libstdthreads<br>
> -#zlib = @BUILD-TARGET@/c/@BSP@/cpukit/zlib<br>
> +score = @BUILD-TARGET@/@BSP@/cpukit/score/src<br>
> +rtems = @BUILD-TARGET@/@BSP@/cpukit/rtems/src<br>
> +sapi = @BUILD-TARGET@/@BSP@/cpukit/sapi/src<br>
> +libdl = @BUILD-TARGET@/@BSP@/cpukit/libdl<br>
> +posix = @BUILD-TARGET@/@BSP@/cpukit/posix/src<br>
> +librfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/rfs<br>
> +libpipe = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/pipe<br>
> +libdosfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/dosfs<br>
> +#libdevfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/devfs<br>
> +libimfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/imfs<br>
> +#libdefaultsfs = @BUiLD-TARGET@/@BSP@/cpukit/libfs<br>
> +libjffs2 = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/jffs2/src<br>
> +#dtc = @BUILD-TARGET@/@BSP@/cpukit/libfdt<br>
> +#libdrvmgr = @BUILD-TARGET@/@BSP@/cpukit/libdrvmgr<br>
> +#libi2c = @BUILD-TARGET@/@BSP@/cpukit/libi2c<br>
> +libcsupport = @BUILD-TARGET@/@BSP@/cpukit/libcsupport/src<br>
> +libbspcmdline = @BUILD-TARGET@/@BSP@/cpukit/libmisc/bspcmdline<br>
> +libcpuuse = @BUILD-TARGET@/@BSP@/cpukit/libmisc/cpuuse<br>
> +libstackchk = @BUILD-TARGET@/@BSP@/cpukit/libmisc/stackchk<br>
> +libfsmount = @BUILD-TARGET@/@BSP@/cpukit/libmisc/fsmount<br>
> +libstringto = @BUILD-TARGET@/@BSP@/cpukit/libmisc/stringto<br>
> +libdevnull = @BUILD-TARGET@/@BSP@/cpukit/libmisc/devnull<br>
> +libdumpbuf = @BUILD-TARGET@/@BSP@/cpukit/libmisc/dumpbuf<br>
> +#libcapture = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libdummy = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libmonitor = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libmouse = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libmw-fb = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libredirector = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#librtemsfdt = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libserdbg = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libshell = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libtestsupport= @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +libuntar = @BUILD-TARGET@/@BSP@/cpukit/libmisc/untar<br>
> +#libutf8proc = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libuuid = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +#libxz = @BUILD-TARGET@/@BSP@/cpukit/libmisc<br>
> +libblock = @BUILD-TARGET@/@BSP@/cpukit/libblock/src<br>
> +#libpci = @BUILD-TARGET@/@BSP@/cpukit/libpci<br>
> +#librpc = @BUILD-TARGET@/@BSP@/cpukit/librpc<br>
> +#libxdr = @BUILD-TARGET@/@BSP@/cpukit/librpc<br>
> +libcrypt = @BUILD-TARGET@/@BSP@/cpukit/libcrypt<br>
> +libmd = @BUILD-TARGET@/@BSP@/cpukit/libmd<br>
> +libstdthreads = @BUILD-TARGET@/@BSP@/cpukit/libstdthreads<br>
> +#zlib = @BUILD-TARGET@/@BSP@/cpukit/zlib<br>
> --<br>
> 2.27.0<br>
><br>
> _______________________________________________<br>
> devel mailing list<br>
> <a href="mailto:devel@rtems.org" target="_blank">devel@rtems.org</a><br>
> <a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div></div>