[PATCH 01/22] tester: Update to support new build system
Joel Sherrill
joel at rtems.org
Tue Mar 2 15:52:12 UTC 2021
On Tue, Mar 2, 2021 at 9:46 AM Gedare Bloom <gedare at rtems.org> wrote:
> On Mon, Mar 1, 2021 at 1:01 PM Alex White <alexanderjwhite at gmail.com>
> wrote:
> >
> > The tester configurations had not been updated to match the paths and
> > conventions used by the new build system. These have been updated,
> > and a few more libraries have been enabled in symbol-sets.ini.
> > ---
> > tester/rtems/testing/bsps/griscv-sis-cov.ini | 4 +-
> > tester/rtems/testing/bsps/leon3-qemu-cov.ini | 4 +-
> > tester/rtems/testing/bsps/leon3-sis-cov.ini | 4 +-
> > tester/rtems/testing/coverage/symbol-sets.ini | 91 ++++++++++---------
> > 4 files changed, 52 insertions(+), 51 deletions(-)
> >
> > diff --git a/tester/rtems/testing/bsps/griscv-sis-cov.ini
> b/tester/rtems/testing/bsps/griscv-sis-cov.ini
> > index 7249af6..e8de95f 100644
> > --- a/tester/rtems/testing/bsps/griscv-sis-cov.ini
> > +++ b/tester/rtems/testing/bsps/griscv-sis-cov.ini
> > @@ -35,7 +35,7 @@
> > bsp = griscv-sis
> > arch = riscv
> > tester = %{_rtscripts}/run.cfg
> > -target = riscv-rtems5
> > +target = riscv
> These are the only ini files that define this target? With this
> change, target is same as arch. Is target needed? I can't immediately
> tell where it gets used later? 'target' is usually understood as the
> binutil/gcc target triplet, so if the triplet is not being used, the
> variable should be less misleading. covoar_target might be better if
> this variable is needed in covar? I don't see it in any other
> non-coverage ini files though, so maybe it is not needed at all?
>
covoar originally used nm, addr2line, and objdump. This has been reduced to
objdump but it needs the target name to be able to invoke that. At this
point,
the target has to be provided or covoar has to have rtems6 hard-coded and
add rtems6 to the architecture.
Is there a variable in the tester to set this to?
> > 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
> > +bsp_covoar_cmd = -T riscv-rtems6 -S %{bsp_symbol_path} -E
> %{cov_explanations} -f TSIM
>
> what about:
> -T %{arch}-rtems%{rtems_version}
>
> We should be limiting hard-coding version numbers.
>
If that works, I would be happy.
> > diff --git a/tester/rtems/testing/bsps/leon3-qemu-cov.ini
> b/tester/rtems/testing/bsps/leon3-qemu-cov.ini
> > index 3b183e6..3d558db 100644
> > --- a/tester/rtems/testing/bsps/leon3-qemu-cov.ini
> > +++ b/tester/rtems/testing/bsps/leon3-qemu-cov.ini
> > @@ -34,8 +34,8 @@
> > [leon3-qemu-cov]
> > bsp = leon3-qemu
> > arch = sparc
> > -target = sparc-rtems5
> > +target = sparc
> > 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
> > -bsp_covoar_cmd = -S %{bsp_symbol_path} -E %{cov_explanations}
> > +bsp_covoar_cmd = -T sparc-rtems6 -S %{bsp_symbol_path} -E
> %{cov_explanations}
> > diff --git a/tester/rtems/testing/bsps/leon3-sis-cov.ini
> b/tester/rtems/testing/bsps/leon3-sis-cov.ini
> > index 626d314..66dae87 100644
> > --- a/tester/rtems/testing/bsps/leon3-sis-cov.ini
> > +++ b/tester/rtems/testing/bsps/leon3-sis-cov.ini
> > @@ -35,7 +35,7 @@
> > bsp = leon3-sis
> > arch = sparc
> > tester = %{_rtscripts}/run.cfg
> > -target = sparc-rtems5
> > +target = sparc
> > 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
> > +bsp_covoar_cmd = -T sparc-rtems6 -S %{bsp_symbol_path} -E
> %{cov_explanations} -f TSIM
> > diff --git a/tester/rtems/testing/coverage/symbol-sets.ini
> b/tester/rtems/testing/coverage/symbol-sets.ini
> > index 8f85533..9617dd8 100644
> > --- a/tester/rtems/testing/coverage/symbol-sets.ini
> > +++ b/tester/rtems/testing/coverage/symbol-sets.ini
> > @@ -29,50 +29,51 @@
> > #
> >
> > [symbol-sets]
> > -sets =
> score,rtems,sapi,libdl,posix,librfs,libdosfs,libdevfs,libimfs,libbspcmdline,libcpuuse,libstackchk,libfsmount,libstringto,libdevnull,libdumpbuf,libblock
> > +sets =
> score,rtems,sapi,posix,librfs,libpipe,libdosfs,libimfs,libjffs2,libcsupport,libbspcmdline,libcpuuse,libstackchk,libfsmount,libstringto,libdevnull,libdumpbuf,libuntar,libblock,libcrypt,libmd,libstdthreads
> >
> > [libraries]
> > -score = @BUILD-TARGET@/c/@BSP@/cpukit/score/src
> > -rtems = @BUILD-TARGET@/c/@BSP@/cpukit/rtems/src
> > -sapi = @BUILD-TARGET@/c/@BSP@/cpukit/sapi/src
> > -libdl = @BUILD-TARGET@/c/@BSP@/cpukit/libdl
> > -posix = @BUILD-TARGET@/c/@BSP@/cpukit/posix/src
> > -librfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/rfs
> > -libdosfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/dosfs
> > -libdevfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/devfs
> > -libimfs = @BUILD-TARGET@/c/@BSP@/cpukit/libfs/src/imfs
> > -#libdefaultsfs = @BUiLD-TARGET@/c/@BSP@/cpukit/libfs
> > -#libjffs2 = @BUILD-TARGET@/c/@BSP@/cpukit/libfs
> > -#dtc = @BUILD-TARGET@/c/@BSP@/cpukit/libfdt
> > -#libdrvmgr = @BUILD-TARGET@/c/@BSP@/cpukit/libdrvmgr
> > -#libi2c = @BUILD-TARGET@/c/@BSP@/cpukit/libi2c
> > -#libcsupport = @BUILD-TARGET@/c/@BSP@/cpukit/libcsupport/src
> > -libbspcmdline = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/bspcmdline
> > -libcpuuse = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/cpuuse
> > -libstackchk = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/stackchk
> > -libfsmount = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/fsmount
> > -libstringto = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/stringto
> > -libdevnull = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/devnull
> > -libdumpbuf = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc/dumpbuf
> > -#libcapture = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libdummy = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libmonitor = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libmouse = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libmw-fb = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libredirector = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#librtemsfdt = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libserdbg = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libshell = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libtestsupport= @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libuntar = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libutf8proc = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libuuid = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -#libxz = @BUILD-TARGET@/c/@BSP@/cpukit/libmisc
> > -libblock = @BUILD-TARGET@/c/@BSP@/cpukit/libblock/src
> > -#libpci = @BUILD-TARGET@/c/@BSP@/cpukit/libpci
> > -#librpc = @BUILD-TARGET@/c/@BSP@/cpukit/librpc
> > -#libxdr = @BUILD-TARGET@/c/@BSP@/cpukit/librpc
> > -#libcrypt = @BUILD-TARGET@/c/@BSP@/cpukit/libcrypt
> > -#libmd = @BUILD-TARGET@/c/@BSP@/cpukit/libmd
> > -#libstdthreads = @BUILD-TARGET@/c/@BSP@/cpukit/libstdthreads
> > -#zlib = @BUILD-TARGET@/c/@BSP@/cpukit/zlib
> > +score = @BUILD-TARGET@/@BSP@/cpukit/score/src
> > +rtems = @BUILD-TARGET@/@BSP@/cpukit/rtems/src
> > +sapi = @BUILD-TARGET@/@BSP@/cpukit/sapi/src
> > +libdl = @BUILD-TARGET@/@BSP@/cpukit/libdl
> > +posix = @BUILD-TARGET@/@BSP@/cpukit/posix/src
> > +librfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/rfs
> > +libpipe = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/pipe
> > +libdosfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/dosfs
> > +#libdevfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/devfs
> > +libimfs = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/imfs
> > +#libdefaultsfs = @BUiLD-TARGET@/@BSP@/cpukit/libfs
> > +libjffs2 = @BUILD-TARGET@/@BSP@/cpukit/libfs/src/jffs2/src
> > +#dtc = @BUILD-TARGET@/@BSP@/cpukit/libfdt
> > +#libdrvmgr = @BUILD-TARGET@/@BSP@/cpukit/libdrvmgr
> > +#libi2c = @BUILD-TARGET@/@BSP@/cpukit/libi2c
> > +libcsupport = @BUILD-TARGET@/@BSP@/cpukit/libcsupport/src
> > +libbspcmdline = @BUILD-TARGET@/@BSP@/cpukit/libmisc/bspcmdline
> > +libcpuuse = @BUILD-TARGET@/@BSP@/cpukit/libmisc/cpuuse
> > +libstackchk = @BUILD-TARGET@/@BSP@/cpukit/libmisc/stackchk
> > +libfsmount = @BUILD-TARGET@/@BSP@/cpukit/libmisc/fsmount
> > +libstringto = @BUILD-TARGET@/@BSP@/cpukit/libmisc/stringto
> > +libdevnull = @BUILD-TARGET@/@BSP@/cpukit/libmisc/devnull
> > +libdumpbuf = @BUILD-TARGET@/@BSP@/cpukit/libmisc/dumpbuf
> > +#libcapture = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libdummy = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libmonitor = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libmouse = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libmw-fb = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libredirector = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#librtemsfdt = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libserdbg = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libshell = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libtestsupport= @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +libuntar = @BUILD-TARGET@/@BSP@/cpukit/libmisc/untar
> > +#libutf8proc = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libuuid = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +#libxz = @BUILD-TARGET@/@BSP@/cpukit/libmisc
> > +libblock = @BUILD-TARGET@/@BSP@/cpukit/libblock/src
> > +#libpci = @BUILD-TARGET@/@BSP@/cpukit/libpci
> > +#librpc = @BUILD-TARGET@/@BSP@/cpukit/librpc
> > +#libxdr = @BUILD-TARGET@/@BSP@/cpukit/librpc
> > +libcrypt = @BUILD-TARGET@/@BSP@/cpukit/libcrypt
> > +libmd = @BUILD-TARGET@/@BSP@/cpukit/libmd
> > +libstdthreads = @BUILD-TARGET@/@BSP@/cpukit/libstdthreads
> > +#zlib = @BUILD-TARGET@/@BSP@/cpukit/zlib
> > --
> > 2.27.0
> >
> > _______________________________________________
> > devel mailing list
> > devel at rtems.org
> > http://lists.rtems.org/mailman/listinfo/devel
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20210302/08ab4f1b/attachment-0001.html>
More information about the devel
mailing list