| Message ID | 20200903112107.27367-7-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | some testing and CI updates (re-greening) | expand |
Il gio 3 set 2020, 13:21 Alex Bennée <alex.bennee@linaro.org> ha scritto: > As the tests build only softfloat.c no actual TCG machinary is neede > to test them (as is evidenced by GCC check-softfloat). Might as well > fix the wording on Travis while at it. > The reason is that softfloat is not built at all into QEMU if !CONFIG_TCG. We similarly skip block layer tests if !CONFIG_SOFTMMU && !CONFIG_TOOLS. Paolo > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .travis.yml | 2 +- > tests/meson.build | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index 1d0ade0a133..65341634d02 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -138,7 +138,7 @@ jobs: > > > # Just build tools and run minimal unit and softfloat checks > - - name: "GCC check-softfloat (user)" > + - name: "GCC check-unit and check-softfloat" > env: > - BASE_CONFIG="--enable-tools" > - CONFIG="--disable-user --disable-system" > diff --git a/tests/meson.build b/tests/meson.build > index fe2c6d8e6b6..bdcc5d75293 100644 > --- a/tests/meson.build > +++ b/tests/meson.build > @@ -7,8 +7,9 @@ test('decodetree', sh, > workdir: meson.current_source_dir() / 'decode', > suite: 'decodetree') > > +subdir('fp') > + > if 'CONFIG_TCG' in config_host > - subdir('fp') > if 'CONFIG_PLUGIN' in config_host > subdir('plugin') > endif > -- > 2.20.1 > > <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il gio 3 set 2020, 13:21 Alex Bennée <<a href="mailto:alex.bennee@linaro.org">alex.bennee@linaro.org</a>> ha scritto:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">As the tests build only softfloat.c no actual TCG machinary is neede<br> to test them (as is evidenced by GCC check-softfloat). Might as well<br> fix the wording on Travis while at it.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">The reason is that softfloat is not built at all into QEMU if !CONFIG_TCG. We similarly skip block layer tests if !CONFIG_SOFTMMU && !CONFIG_TOOLS.</div><div dir="auto"><br></div><div dir="auto">Paolo<br></div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> Signed-off-by: Alex Bennée <<a href="mailto:alex.bennee@linaro.org" target="_blank" rel="noreferrer">alex.bennee@linaro.org</a>><br> ---<br> .travis.yml | 2 +-<br> tests/meson.build | 3 ++-<br> 2 files changed, 3 insertions(+), 2 deletions(-)<br> <br> diff --git a/.travis.yml b/.travis.yml<br> index 1d0ade0a133..65341634d02 100644<br> --- a/.travis.yml<br> +++ b/.travis.yml<br> @@ -138,7 +138,7 @@ jobs:<br> <br> <br> # Just build tools and run minimal unit and softfloat checks<br> - - name: "GCC check-softfloat (user)"<br> + - name: "GCC check-unit and check-softfloat"<br> env:<br> - BASE_CONFIG="--enable-tools"<br> - CONFIG="--disable-user --disable-system"<br> diff --git a/tests/meson.build b/tests/meson.build<br> index fe2c6d8e6b6..bdcc5d75293 100644<br> --- a/tests/meson.build<br> +++ b/tests/meson.build<br> @@ -7,8 +7,9 @@ test('decodetree', sh,<br> workdir: meson.current_source_dir() / 'decode',<br> suite: 'decodetree')<br> <br> +subdir('fp')<br> +<br> if 'CONFIG_TCG' in config_host<br> - subdir('fp')<br> if 'CONFIG_PLUGIN' in config_host<br> subdir('plugin')<br> endif<br> -- <br> 2.20.1<br> <br> </blockquote></div></div></div>
Paolo Bonzini <pbonzini@redhat.com> writes: > Il gio 3 set 2020, 13:21 Alex Bennée <alex.bennee@linaro.org> ha scritto: > >> As the tests build only softfloat.c no actual TCG machinary is neede >> to test them (as is evidenced by GCC check-softfloat). Might as well >> fix the wording on Travis while at it. >> > > The reason is that softfloat is not built at all into QEMU if !CONFIG_TCG. > We similarly skip block layer tests if !CONFIG_SOFTMMU && > !CONFIG_TOOLS. It's not built anyway if you don't call the test. Are you saying a --disable-system and --disable-user build is invalid for running unit tests? That is what check-softfloat is doing as it doesn't involve softfloat built into any qemu binary. > > Paolo > > >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> .travis.yml | 2 +- >> tests/meson.build | 3 ++- >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/.travis.yml b/.travis.yml >> index 1d0ade0a133..65341634d02 100644 >> --- a/.travis.yml >> +++ b/.travis.yml >> @@ -138,7 +138,7 @@ jobs: >> >> >> # Just build tools and run minimal unit and softfloat checks >> - - name: "GCC check-softfloat (user)" >> + - name: "GCC check-unit and check-softfloat" >> env: >> - BASE_CONFIG="--enable-tools" >> - CONFIG="--disable-user --disable-system" >> diff --git a/tests/meson.build b/tests/meson.build >> index fe2c6d8e6b6..bdcc5d75293 100644 >> --- a/tests/meson.build >> +++ b/tests/meson.build >> @@ -7,8 +7,9 @@ test('decodetree', sh, >> workdir: meson.current_source_dir() / 'decode', >> suite: 'decodetree') >> >> +subdir('fp') >> + >> if 'CONFIG_TCG' in config_host >> - subdir('fp') >> if 'CONFIG_PLUGIN' in config_host >> subdir('plugin') >> endif >> -- >> 2.20.1 >> >> -- Alex Bennée
On 9/7/20 11:11 AM, Alex Bennée wrote: > > Paolo Bonzini <pbonzini@redhat.com> writes: > >> Il gio 3 set 2020, 13:21 Alex Bennée <alex.bennee@linaro.org> ha scritto: >> >>> As the tests build only softfloat.c no actual TCG machinary is neede >>> to test them (as is evidenced by GCC check-softfloat). Might as well >>> fix the wording on Travis while at it. >>> >> >> The reason is that softfloat is not built at all into QEMU if !CONFIG_TCG. >> We similarly skip block layer tests if !CONFIG_SOFTMMU && >> !CONFIG_TOOLS. > > It's not built anyway if you don't call the test. Are you saying a > --disable-system and --disable-user build is invalid for running unit > tests? That is what check-softfloat is doing as it doesn't involve > softfloat built into any qemu binary. FYI my tools build dir is configured as: '--enable-trace-backends=log' '--disable-docs' '--enable-debug' '--disable-system' '--disable-user' '--enable-tools' and it still works after the Meson conversion. > >> >> Paolo >> >> >>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>> --- >>> .travis.yml | 2 +- >>> tests/meson.build | 3 ++- >>> 2 files changed, 3 insertions(+), 2 deletions(-) >>> >>> diff --git a/.travis.yml b/.travis.yml >>> index 1d0ade0a133..65341634d02 100644 >>> --- a/.travis.yml >>> +++ b/.travis.yml >>> @@ -138,7 +138,7 @@ jobs: >>> >>> >>> # Just build tools and run minimal unit and softfloat checks >>> - - name: "GCC check-softfloat (user)" >>> + - name: "GCC check-unit and check-softfloat" >>> env: >>> - BASE_CONFIG="--enable-tools" >>> - CONFIG="--disable-user --disable-system" >>> diff --git a/tests/meson.build b/tests/meson.build >>> index fe2c6d8e6b6..bdcc5d75293 100644 >>> --- a/tests/meson.build >>> +++ b/tests/meson.build >>> @@ -7,8 +7,9 @@ test('decodetree', sh, >>> workdir: meson.current_source_dir() / 'decode', >>> suite: 'decodetree') >>> >>> +subdir('fp') >>> + >>> if 'CONFIG_TCG' in config_host >>> - subdir('fp') >>> if 'CONFIG_PLUGIN' in config_host >>> subdir('plugin') >>> endif >>> -- >>> 2.20.1 >>> >>> > >
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > On 9/7/20 11:11 AM, Alex Bennée wrote: >> >> Paolo Bonzini <pbonzini@redhat.com> writes: >> >>> Il gio 3 set 2020, 13:21 Alex Bennée <alex.bennee@linaro.org> ha scritto: >>> >>>> As the tests build only softfloat.c no actual TCG machinary is neede >>>> to test them (as is evidenced by GCC check-softfloat). Might as well >>>> fix the wording on Travis while at it. >>>> >>> >>> The reason is that softfloat is not built at all into QEMU if !CONFIG_TCG. >>> We similarly skip block layer tests if !CONFIG_SOFTMMU && >>> !CONFIG_TOOLS. >> >> It's not built anyway if you don't call the test. Are you saying a >> --disable-system and --disable-user build is invalid for running unit >> tests? That is what check-softfloat is doing as it doesn't involve >> softfloat built into any qemu binary. > > FYI my tools build dir is configured as: > > '--enable-trace-backends=log' '--disable-docs' '--enable-debug' > '--disable-system' '--disable-user' '--enable-tools' > > and it still works after the Meson conversion. But check-softfloat doesn't work with that right? -- Alex Bennée
On 9/7/20 11:55 AM, Alex Bennée wrote: > > Philippe Mathieu-Daudé <philmd@redhat.com> writes: > >> On 9/7/20 11:11 AM, Alex Bennée wrote: >>> >>> Paolo Bonzini <pbonzini@redhat.com> writes: >>> >>>> Il gio 3 set 2020, 13:21 Alex Bennée <alex.bennee@linaro.org> ha scritto: >>>> >>>>> As the tests build only softfloat.c no actual TCG machinary is neede >>>>> to test them (as is evidenced by GCC check-softfloat). Might as well >>>>> fix the wording on Travis while at it. >>>>> >>>> >>>> The reason is that softfloat is not built at all into QEMU if !CONFIG_TCG. >>>> We similarly skip block layer tests if !CONFIG_SOFTMMU && >>>> !CONFIG_TOOLS. >>> >>> It's not built anyway if you don't call the test. Are you saying a >>> --disable-system and --disable-user build is invalid for running unit >>> tests? That is what check-softfloat is doing as it doesn't involve >>> softfloat built into any qemu binary. >> >> FYI my tools build dir is configured as: >> >> '--enable-trace-backends=log' '--disable-docs' '--enable-debug' >> '--disable-system' '--disable-user' '--enable-tools' >> >> and it still works after the Meson conversion. > > But check-softfloat doesn't work with that right? Sorry I can't say, I don't test it :/
diff --git a/.travis.yml b/.travis.yml index 1d0ade0a133..65341634d02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,7 +138,7 @@ jobs: # Just build tools and run minimal unit and softfloat checks - - name: "GCC check-softfloat (user)" + - name: "GCC check-unit and check-softfloat" env: - BASE_CONFIG="--enable-tools" - CONFIG="--disable-user --disable-system" diff --git a/tests/meson.build b/tests/meson.build index fe2c6d8e6b6..bdcc5d75293 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -7,8 +7,9 @@ test('decodetree', sh, workdir: meson.current_source_dir() / 'decode', suite: 'decodetree') +subdir('fp') + if 'CONFIG_TCG' in config_host - subdir('fp') if 'CONFIG_PLUGIN' in config_host subdir('plugin') endif
As the tests build only softfloat.c no actual TCG machinary is neede to test them (as is evidenced by GCC check-softfloat). Might as well fix the wording on Travis while at it. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- .travis.yml | 2 +- tests/meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.20.1