From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:54:26 +0000 (-0700)
Subject: [3.12] Display the sanitizer config in the regrtest header. (GH-105301) (#105342)
X-Git-Tag: v3.12.0b4~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc2393e4177d32dab0c73f69472dc1b726dbeeaf;p=thirdparty%2FPython%2Fcpython.git

[3.12] Display the sanitizer config in the regrtest header. (GH-105301) (#105342)

Display the sanitizer config in the regrtest header. (GH-105301)

Display the sanitizers present in libregrtest.

Having this in the CI output for tests with the relevant environment
variable displayed will help make it easier to do what we need to
create an equivalent local test run.
(cherry picked from commit 852348ab65783601e0844b6647ea033668b45c11)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
---

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 3c3509d03033..9001ca33b616 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -526,6 +526,26 @@ class Regrtest:
             print("== CPU count:", cpu_count)
         print("== encodings: locale=%s, FS=%s"
               % (locale.getencoding(), sys.getfilesystemencoding()))
+        asan = support.check_sanitizer(address=True)
+        msan = support.check_sanitizer(memory=True)
+        ubsan = support.check_sanitizer(ub=True)
+        # This makes it easier to remember what to set in your local
+        # environment when trying to reproduce a sanitizer failure.
+        if asan or msan or ubsan:
+            names = [n for n in (asan and "address",
+                                 msan and "memory",
+                                 ubsan and "undefined behavior")
+                     if n]
+            print(f"== sanitizers: {', '.join(names)}")
+            a_opts = os.environ.get("ASAN_OPTIONS")
+            if asan and a_opts is not None:
+                print(f"==  ASAN_OPTIONS={a_opts}")
+            m_opts = os.environ.get("ASAN_OPTIONS")
+            if msan and m_opts is not None:
+                print(f"==  MSAN_OPTIONS={m_opts}")
+            ub_opts = os.environ.get("UBSAN_OPTIONS")
+            if ubsan and ub_opts is not None:
+                print(f"==  UBSAN_OPTIONS={ub_opts}")
 
     def no_tests_run(self):
         return not any((self.good, self.bad, self.skipped, self.interrupted,
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 3f1cc3a083a1..3b332f49951f 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -414,7 +414,7 @@ def check_sanitizer(*, address=False, memory=False, ub=False):
     )
     address_sanitizer = (
         '-fsanitize=address' in _cflags or
-        '--with-memory-sanitizer' in _config_args
+        '--with-address-sanitizer' in _config_args
     )
     ub_sanitizer = (
         '-fsanitize=undefined' in _cflags or