Author: Rainer Orth Date: 2024-07-30T12:07:31+02:00 New Revision: 67f509a93be67aab643ab2ca333a2f8149f49be2
URL: https://github.com/llvm/llvm-project/commit/67f509a93be67aab643ab2ca333a2f8149f49be2 DIFF: https://github.com/llvm/llvm-project/commit/67f509a93be67aab643ab2ca333a2f8149f49be2.diff LOG: [sanitizer_common][test] Always skip select allocator tests on SPARC V9 (#100530) Two allocator tests `FAIL` on Linux/sparc64: ``` SanitizerCommon-Unit :: ./Sanitizer-sparcv9-Test/SanitizerCommon/CombinedAllocator32Compact SanitizerCommon-Unit :: ./Sanitizer-sparcv9-Test/SanitizerCommon/SizeClassAllocator32Iteration ``` The failure mode is the same on Solaris/sparcv9, where those tests are already disabled since 0f69cbe2694a4740e6db5b99bd81a26746403072. Therefore, this patch skips them on SPARC in general. Tested on `sparc64-unknown-linux-gnu` and `sparcv9-sun-solaris2.11`. (cherry picked from commit 3d149123f46cee5ac8d961c6bf77c5c566f1e410) Added: Modified: compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp Removed: ################################################################################ diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp index 1a1ccce82d259..601897a64f051 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp @@ -28,12 +28,13 @@ using namespace __sanitizer; -#if SANITIZER_SOLARIS && defined(__sparcv9) +#if defined(__sparcv9) // FIXME: These tests probably fail because Solaris/sparcv9 uses the full -// 64-bit address space. Needs more investigation -#define SKIP_ON_SOLARIS_SPARCV9(x) DISABLED_##x +// 64-bit address space. Same on Linux/sparc64, so probably a general SPARC +// issue. Needs more investigation +# define SKIP_ON_SPARCV9(x) DISABLED_##x #else -#define SKIP_ON_SOLARIS_SPARCV9(x) x +# define SKIP_ON_SPARCV9(x) x #endif // On 64-bit systems with small virtual address spaces (e.g. 39-bit) we can't @@ -781,7 +782,7 @@ TEST(SanitizerCommon, CombinedAllocator64VeryCompact) { } #endif -TEST(SanitizerCommon, SKIP_ON_SOLARIS_SPARCV9(CombinedAllocator32Compact)) { +TEST(SanitizerCommon, SKIP_ON_SPARCV9(CombinedAllocator32Compact)) { TestCombinedAllocator<Allocator32Compact>(); } @@ -1028,7 +1029,7 @@ TEST(SanitizerCommon, SizeClassAllocator64DynamicPremappedIteration) { #endif #endif -TEST(SanitizerCommon, SKIP_ON_SOLARIS_SPARCV9(SizeClassAllocator32Iteration)) { +TEST(SanitizerCommon, SKIP_ON_SPARCV9(SizeClassAllocator32Iteration)) { TestSizeClassAllocatorIteration<Allocator32Compact>(); } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
