[llvm-branch-commits] [compiler-rt] da3cd33 - [compiler-rt] [test] Mark dfsan tests XFAIL on glibc-2.37

[Tom Stellard via llvm-branch-commits]

Author: Michał Górny
Date: 2023-05-02T10:50:56-07:00
New Revision: da3cd333bea572fb10470f610a27f22bcb84b08c

URL: https://github.com/llvm/llvm-project/commit/da3cd333bea572fb10470f610a27f22bcb84b08c
DIFF: https://github.com/llvm/llvm-project/commit/da3cd333bea572fb10470f610a27f22bcb84b08c.diff

LOG: [compiler-rt] [test] Mark dfsan tests XFAIL on glibc-2.37

Mark the two dfsan tests that are known to be broken on glibc-2.37
as XFAIL, to make the test suite start passing on Gentoo again.

Bug: https://github.com/llvm/llvm-project/issues/60678

Differential Revision: https://reviews.llvm.org/D148496

(cherry picked from commit 488a4b24817ae7d9319d8a99bd96c491b2035641)

Added: 
    

Modified: 
    compiler-rt/test/dfsan/custom.cpp
    compiler-rt/test/dfsan/release_shadow_space.c
    compiler-rt/test/lit.common.cfg.py

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/dfsan/custom.cpp b/compiler-rt/test/dfsan/custom.cpp
index 6fb1e5b8db808..6808cb19dd05a 100644
--- a/compiler-rt/test/dfsan/custom.cpp
+++ b/compiler-rt/test/dfsan/custom.cpp
@@ -1,3 +1,6 @@
+// https://github.com/llvm/llvm-project/issues/60678
+// XFAIL: glibc-2.37
+
 // RUN: %clang_dfsan %s -o %t && DFSAN_OPTIONS="strict_data_dependencies=0" %run %t
 // RUN: %clang_dfsan -DSTRICT_DATA_DEPENDENCIES %s -o %t && %run %t
 // RUN: %clang_dfsan -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 -mllvm -dfsan-combine-pointer-labels-on-load=false -DSTRICT_DATA_DEPENDENCIES %s -o %t && %run %t

diff  --git a/compiler-rt/test/dfsan/release_shadow_space.c b/compiler-rt/test/dfsan/release_shadow_space.c
index 675640a1c296d..9492f2ad7728c 100644
--- a/compiler-rt/test/dfsan/release_shadow_space.c
+++ b/compiler-rt/test/dfsan/release_shadow_space.c
@@ -1,3 +1,6 @@
+// https://github.com/llvm/llvm-project/issues/60678
+// XFAIL: glibc-2.37
+
 // DFSAN_OPTIONS=no_huge_pages_for_shadow=false RUN: %clang_dfsan %s -o %t && %run %t
 // DFSAN_OPTIONS=no_huge_pages_for_shadow=true RUN: %clang_dfsan %s -o %t && %run %t
 // DFSAN_OPTIONS=no_huge_pages_for_shadow=false RUN: %clang_dfsan %s -DORIGIN_TRACKING -mllvm -dfsan-track-origins=1 -o %t && %run %t

diff  --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index 5a6f04afffed2..c4840f89869ba 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -516,7 +516,7 @@ def get_macos_aligned_version(macos_vers):
   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", "2.34"]:
+    for required in ["2.27", "2.30", "2.34", "2.37"]:
       if ver >= LooseVersion(required):
         config.available_features.add("glibc-" + required)