On Mon, 10 Mar 2025 at 17:34, Philippe Mathieu-Daudé <phi...@linaro.org> wrote:
>
> On 10/3/25 14:18, Peter Maydell wrote:
> > On Mon, 10 Mar 2025 at 13:15, Philippe Mathieu-Daudé <phi...@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.mayd...@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
