From e6c8b52bc3c7e736ea14104c027390bb249fe662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 17 Apr 2023 07:54:57 +0200 Subject: [PATCH] [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) --- compiler-rt/test/dfsan/custom.cpp | 3 +++ compiler-rt/test/dfsan/release_shadow_space.c | 3 +++ compiler-rt/test/lit.common.cfg.py | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler-rt/test/dfsan/custom.cpp b/compiler-rt/test/dfsan/custom.cpp index 6fb1e5b8db80..6808cb19dd05 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 675640a1c296..9492f2ad7728 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 5a6f04afffed..c4840f89869b 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)