From c1b51f098751b384040c3f4c5a4608f208d5e3f5 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Mon, 15 Nov 2021 11:18:40 -0800 Subject: [PATCH] [msan] Disabled test failing on new GLIBC (cherry picked from commit 118757af11954ffd43c16a41e39348e0907bba92) --- compiler-rt/test/lit.common.cfg.py | 2 +- compiler-rt/test/msan/preinit_array.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index 9253aff2fb42..c7be6f640fcb 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -491,7 +491,7 @@ if config.host_os == 'Linux': if not config.android and len(ver_lines) and ver_lines[0].startswith(b"ldd "): from distutils.version import LooseVersion ver = LooseVersion(ver_lines[0].split()[-1].decode()) - for required in ["2.27", "2.30"]: + for required in ["2.27", "2.30", "2.34"]: if ver >= LooseVersion(required): config.available_features.add("glibc-" + required) diff --git a/compiler-rt/test/msan/preinit_array.cpp b/compiler-rt/test/msan/preinit_array.cpp index 6f877bac0b1c..c72004ecfb21 100644 --- a/compiler-rt/test/msan/preinit_array.cpp +++ b/compiler-rt/test/msan/preinit_array.cpp @@ -1,5 +1,8 @@ // RUN: %clangxx_msan -O0 %s -o %t && %run %t +// FIXME: Something changed in glibc 2.34, maybe earier. +// UNSUPPORTED: glibc-2.34 + #include volatile int global;