From 8480f3e795395edeb9b8c25ae5fae4afb05559c7 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Wed, 20 Mar 2024 16:47:15 -0400 Subject: [PATCH] fix: set `MSAN_OPTIONS` when not set, rather than `UBSAN_OPTIONS` --- mesonbuild/mtest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 21414d2c5677..b9f72fac7dab 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -1415,7 +1415,7 @@ def __init__(self, test: TestSerialisation, env: T.Dict[str, str], name: str, if ('UBSAN_OPTIONS' not in env or not env['UBSAN_OPTIONS']): env['UBSAN_OPTIONS'] = 'halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1' if ('MSAN_OPTIONS' not in env or not env['MSAN_OPTIONS']): - env['UBSAN_OPTIONS'] = 'halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1' + env['MSAN_OPTIONS'] = 'halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1' if self.options.gdb or self.test.timeout is None or self.test.timeout <= 0: timeout = None