summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2021-11-15 11:18:40 -0800
committerTom Stellard <tstellar@redhat.com>2021-12-20 15:38:55 -0800
commitc1b51f098751b384040c3f4c5a4608f208d5e3f5 (patch)
treeb231d1f5bc7a634603fb8650f986ae0d0805509a
parent578e500fe5ba0abbb1ed212db720ce22aa2147d2 (diff)
downloadllvm-c1b51f098751b384040c3f4c5a4608f208d5e3f5.tar.gz
[msan] Disabled test failing on new GLIBC
(cherry picked from commit 118757af11954ffd43c16a41e39348e0907bba92)
-rw-r--r--compiler-rt/test/lit.common.cfg.py2
-rw-r--r--compiler-rt/test/msan/preinit_array.cpp3
2 files changed, 4 insertions, 1 deletions
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 <sanitizer/msan_interface.h>
volatile int global;