Skip to content

Commit

Permalink
fix: set MSAN_OPTIONS when not set, rather than UBSAN_OPTIONS
Browse files Browse the repository at this point in the history
  • Loading branch information
c-dilks authored and dcbaker committed Mar 20, 2024
1 parent 4b5caa8 commit 8480f3e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mesonbuild/mtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8480f3e

Please sign in to comment.