1. Patchew
  2. QEMU
  3. View series

[PATCH] meson.build: Set RUST_BACKTRACE for all tests

Peter Maydell posted 1 patch 3 weeks, 2 days ago 
meson.build                         | 9 ++++++---
.gitlab-ci.d/buildtest-template.yml | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
[PATCH] meson.build: Set RUST_BACKTRACE for all tests
Posted by Peter Maydell 3 weeks, 2 days ago 
We want to capture potential Rust backtraces on panics in our test
logs, which isn't Rust's default behaviour.  Set RUST_BACKTRACE=1 in
the add_test_setup environments, so that all our tests get run with
this environment variable set.

This makes the setting of that variable in the gitlab CI template
redundant, so we can remove it.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 meson.build                         | 9 ++++++---
 .gitlab-ci.d/buildtest-template.yml | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 8b9fda4d95e..2f373dc675f 100644
--- a/meson.build
+++ b/meson.build
@@ -5,9 +5,12 @@ project('qemu', ['c'], meson_version: '>=1.5.0',
 
 meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
 
-add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
-add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow'])
-add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
+add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true,
+              env: ['RUST_BACKTRACE=1'])
+add_test_setup('slow', exclude_suites: ['thorough'],
+               env: ['G_TEST_SLOW=1', 'SPEED=slow', 'RUST_BACKTRACE=1'])
+add_test_setup('thorough',
+               env: ['G_TEST_SLOW=1', 'SPEED=thorough', 'RUST_BACKTRACE=1'])
 
 meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))
 
diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml
index 4cc19239319..39da7698b09 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -63,7 +63,6 @@
   stage: test
   image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG
   script:
-    - export RUST_BACKTRACE=1
     - source scripts/ci/gitlab-ci-section
     - section_start buildenv "Setting up to run tests"
     - scripts/git-submodule.sh update roms/SLOF
-- 
2.43.0
Re: [PATCH] meson.build: Set RUST_BACKTRACE for all tests
Posted by Philippe Mathieu-Daudé 3 weeks, 2 days ago 
On 10/3/25 11:29, Peter Maydell wrote:
> We want to capture potential Rust backtraces on panics in our test
> logs, which isn't Rust's default behaviour.  Set RUST_BACKTRACE=1 in
> the add_test_setup environments, so that all our tests get run with
> this environment variable set.
> 
> This makes the setting of that variable in the gitlab CI template
> redundant, so we can remove it.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   meson.build                         | 9 ++++++---
>   .gitlab-ci.d/buildtest-template.yml | 1 -
>   2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 8b9fda4d95e..2f373dc675f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -5,9 +5,12 @@ project('qemu', ['c'], meson_version: '>=1.5.0',
>   
>   meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
>   
> -add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
> -add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow'])
> -add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
> +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true,
> +              env: ['RUST_BACKTRACE=1'])
> +add_test_setup('slow', exclude_suites: ['thorough'],
> +               env: ['G_TEST_SLOW=1', 'SPEED=slow', 'RUST_BACKTRACE=1'])
> +add_test_setup('thorough',
> +               env: ['G_TEST_SLOW=1', 'SPEED=thorough', 'RUST_BACKTRACE=1'])

Nitpicking, we can keep sorted:

          env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1', 'SPEED=thorough'])

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Re: [PATCH] meson.build: Set RUST_BACKTRACE for all tests
Posted by Peter Maydell 3 weeks, 2 days ago 
On Mon, 10 Mar 2025 at 13:15, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 10/3/25 11:29, Peter Maydell wrote:
> > We want to capture potential Rust backtraces on panics in our test
> > logs, which isn't Rust's default behaviour.  Set RUST_BACKTRACE=1 in
> > the add_test_setup environments, so that all our tests get run with
> > this environment variable set.
> >
> > This makes the setting of that variable in the gitlab CI template
> > redundant, so we can remove it.
> >
> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> > ---
> >   meson.build                         | 9 ++++++---
> >   .gitlab-ci.d/buildtest-template.yml | 1 -
> >   2 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 8b9fda4d95e..2f373dc675f 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -5,9 +5,12 @@ project('qemu', ['c'], meson_version: '>=1.5.0',
> >
> >   meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
> >
> > -add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
> > -add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow'])
> > -add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
> > +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true,
> > +              env: ['RUST_BACKTRACE=1'])
> > +add_test_setup('slow', exclude_suites: ['thorough'],
> > +               env: ['G_TEST_SLOW=1', 'SPEED=slow', 'RUST_BACKTRACE=1'])
> > +add_test_setup('thorough',
> > +               env: ['G_TEST_SLOW=1', 'SPEED=thorough', 'RUST_BACKTRACE=1'])
>
> Nitpicking, we can keep sorted:
>
>           env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1', 'SPEED=thorough'])

That splits up the two envariables that are controlling the
"run the slow tests" behaviour, though...

-- PMM
Re: [PATCH] meson.build: Set RUST_BACKTRACE for all tests
Posted by Philippe Mathieu-Daudé 3 weeks, 1 day ago 
On 10/3/25 14:18, Peter Maydell wrote:
> On Mon, 10 Mar 2025 at 13:15, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>
>> On 10/3/25 11:29, Peter Maydell wrote:
>>> We want to capture potential Rust backtraces on panics in our test
>>> logs, which isn't Rust's default behaviour.  Set RUST_BACKTRACE=1 in
>>> the add_test_setup environments, so that all our tests get run with
>>> this environment variable set.
>>>
>>> This makes the setting of that variable in the gitlab CI template
>>> redundant, so we can remove it.
>>>
>>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>> ---
>>>    meson.build                         | 9 ++++++---
>>>    .gitlab-ci.d/buildtest-template.yml | 1 -
>>>    2 files changed, 6 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/meson.build b/meson.build
>>> index 8b9fda4d95e..2f373dc675f 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -5,9 +5,12 @@ project('qemu', ['c'], meson_version: '>=1.5.0',
>>>
>>>    meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
>>>
>>> -add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
>>> -add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow'])
>>> -add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
>>> +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true,
>>> +              env: ['RUST_BACKTRACE=1'])
>>> +add_test_setup('slow', exclude_suites: ['thorough'],
>>> +               env: ['G_TEST_SLOW=1', 'SPEED=slow', 'RUST_BACKTRACE=1'])
>>> +add_test_setup('thorough',
>>> +               env: ['G_TEST_SLOW=1', 'SPEED=thorough', 'RUST_BACKTRACE=1'])
>>
>> Nitpicking, we can keep sorted:
>>
>>            env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1', 'SPEED=thorough'])
> 
> That splits up the two envariables that are controlling the
> "run the slow tests" behaviour, though...

I meant:

add_test_setup('slow', exclude_suites: ['thorough'],
                env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1', 'SPEED=slow'])
add_test_setup('thorough',
                env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1', 
'SPEED=thorough'])

But just nitpicking, not a big deal ;)
Re: [PATCH] meson.build: Set RUST_BACKTRACE for all tests
Posted by Peter Maydell 3 weeks, 1 day ago 
On Mon, 10 Mar 2025 at 17:34, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 10/3/25 14:18, Peter Maydell wrote:
> > On Mon, 10 Mar 2025 at 13:15, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> >>
> >> On 10/3/25 11:29, Peter Maydell wrote:
> >>> We want to capture potential Rust backtraces on panics in our test
> >>> logs, which isn't Rust's default behaviour.  Set RUST_BACKTRACE=1 in
> >>> the add_test_setup environments, so that all our tests get run with
> >>> this environment variable set.
> >>>
> >>> This makes the setting of that variable in the gitlab CI template
> >>> redundant, so we can remove it.
> >>>
> >>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> >>> ---
> >>>    meson.build                         | 9 ++++++---
> >>>    .gitlab-ci.d/buildtest-template.yml | 1 -
> >>>    2 files changed, 6 insertions(+), 4 deletions(-)
> >>>
> >>> diff --git a/meson.build b/meson.build
> >>> index 8b9fda4d95e..2f373dc675f 100644
> >>> --- a/meson.build
> >>> +++ b/meson.build
> >>> @@ -5,9 +5,12 @@ project('qemu', ['c'], meson_version: '>=1.5.0',
> >>>
> >>>    meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
> >>>
> >>> -add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
> >>> -add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow'])
> >>> -add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
> >>> +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true,
> >>> +              env: ['RUST_BACKTRACE=1'])
> >>> +add_test_setup('slow', exclude_suites: ['thorough'],
> >>> +               env: ['G_TEST_SLOW=1', 'SPEED=slow', 'RUST_BACKTRACE=1'])
> >>> +add_test_setup('thorough',
> >>> +               env: ['G_TEST_SLOW=1', 'SPEED=thorough', 'RUST_BACKTRACE=1'])
> >>
> >> Nitpicking, we can keep sorted:
> >>
> >>            env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1', 'SPEED=thorough'])
> >
> > That splits up the two envariables that are controlling the
> > "run the slow tests" behaviour, though...
>
> I meant:
>
> add_test_setup('slow', exclude_suites: ['thorough'],
>                 env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1', 'SPEED=slow'])
> add_test_setup('thorough',
>                 env: ['G_TEST_SLOW=1', 'RUST_BACKTRACE=1',
> 'SPEED=thorough'])

Yes, and that splits up the G_TEST_SLOW=1 from the SPEED=whatever
by putting the RUST_BACKTRACE=1 in the middle...

-- PMM
Re: [PATCH] meson.build: Set RUST_BACKTRACE for all tests
Posted by Daniel P. Berrangé 3 weeks, 2 days ago 
On Mon, Mar 10, 2025 at 10:29:50AM +0000, Peter Maydell wrote:
> We want to capture potential Rust backtraces on panics in our test
> logs, which isn't Rust's default behaviour.  Set RUST_BACKTRACE=1 in
> the add_test_setup environments, so that all our tests get run with
> this environment variable set.
> 
> This makes the setting of that variable in the gitlab CI template
> redundant, so we can remove it.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  meson.build                         | 9 ++++++---
>  .gitlab-ci.d/buildtest-template.yml | 1 -
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 8b9fda4d95e..2f373dc675f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -5,9 +5,12 @@ project('qemu', ['c'], meson_version: '>=1.5.0',
>  
>  meson.add_devenv({ 'MESON_BUILD_ROOT' : meson.project_build_root() })
>  
> -add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
> -add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow'])
> -add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
> +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true,
> +              env: ['RUST_BACKTRACE=1'])

Indent off-by-1

> +add_test_setup('slow', exclude_suites: ['thorough'],
> +               env: ['G_TEST_SLOW=1', 'SPEED=slow', 'RUST_BACKTRACE=1'])
> +add_test_setup('thorough',
> +               env: ['G_TEST_SLOW=1', 'SPEED=thorough', 'RUST_BACKTRACE=1'])
>  
>  meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.