1. Patchew
  2. QEMU
  3. [PATCH v1 0/8] some testing and CI updates (re-greening)
  4. View patch

[PATCH v1 6/8] tests/meson.build: fp tests don't need CONFIG_TCG

Alex Bennée posted 8 patches 5 years, 2 months ago
Maintainers: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aurelien Jarno <aurelien@aurel32.net>
[PATCH v1 6/8] tests/meson.build: fp tests don't need CONFIG_TCG
Posted by Alex Bennée 5 years, 2 months ago 
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(-)

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
Re: [PATCH v1 6/8] tests/meson.build: fp tests don't need CONFIG_TCG
Posted by Paolo Bonzini 5 years, 2 months ago 
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
>
>
Re: [PATCH v1 6/8] tests/meson.build: fp tests don't need CONFIG_TCG
Posted by Alex Bennée 5 years, 2 months ago 
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
Re: [PATCH v1 6/8] tests/meson.build: fp tests don't need CONFIG_TCG
Posted by Philippe Mathieu-Daudé 5 years, 2 months ago 
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
>>>
>>>
> 
>
Re: [PATCH v1 6/8] tests/meson.build: fp tests don't need CONFIG_TCG
Posted by Alex Bennée 5 years, 2 months ago 
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
Re: [PATCH v1 6/8] tests/meson.build: fp tests don't need CONFIG_TCG
Posted by Philippe Mathieu-Daudé 5 years, 2 months ago 
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 :/

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.