llvm/0002-PATCH-Disable-CrashRecoveryTest.DumpStackCleanup-tes.patch
Konrad Kleine 758ea3674d Merge remote-tracking branch 'upstream/rawhide' into upstream-snapshot
* upstream/rawhide:
  Remove abi_revision handling
  Drop GetHostTriple export again
  Export GetHostTriple.cmake
  Migrate tests to tests/llvm repo
  Fix compat build symlinks
  Update to LLVM 15.0.0
2022-10-05 22:16:53 +02:00

46 lines
1.8 KiB
Diff

<<<<<<<< HEAD:0002-PATCH-Disable-CrashRecoveryTest.DumpStackCleanup-tes.patch
From d92371e841cfdd6862c8c57cd726292679954e57 Mon Sep 17 00:00:00 2001
========
From 6dd25eb3ca3d8a6847fab029946d15f223b1a551 Mon Sep 17 00:00:00 2001
>>>>>>>> upstream/rawhide:0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch
From: Nikita Popov <npopov@redhat.com>
Date: Mon, 31 Jan 2022 10:33:27 +0100
Subject: [PATCH] Disable CrashRecoveryTest.DumpStackCleanup test on aarch64
Produces a non-reproducible failure on aarch64:
https://bugzilla.redhat.com/show_bug.cgi?id=2048440
---
llvm/unittests/Support/CrashRecoveryTest.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/llvm/unittests/Support/CrashRecoveryTest.cpp b/llvm/unittests/Support/CrashRecoveryTest.cpp
<<<<<<<< HEAD:0002-PATCH-Disable-CrashRecoveryTest.DumpStackCleanup-tes.patch
index 9a1f868019ee..266e9159f361 100644
========
index d942c9d..28efedd 100644
>>>>>>>> upstream/rawhide:0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch
--- a/llvm/unittests/Support/CrashRecoveryTest.cpp
+++ b/llvm/unittests/Support/CrashRecoveryTest.cpp
@@ -76,6 +76,7 @@ TEST(CrashRecoveryTest, Cleanup) {
llvm::CrashRecoveryContext::Disable();
}
+#ifndef __aarch64__
TEST(CrashRecoveryTest, DumpStackCleanup) {
SmallString<128> Filename;
std::error_code EC = sys::fs::createTemporaryFile("crash", "test", Filename);
@@ -101,6 +102,7 @@ TEST(CrashRecoveryTest, DumpStackCleanup) {
EXPECT_EQ(GlobalInt, 1);
llvm::CrashRecoveryContext::Disable();
}
+#endif
TEST(CrashRecoveryTest, LimitedStackTrace) {
// FIXME: Handle "Depth" parameter in PrintStackTrace() function
--
<<<<<<<< HEAD:0002-PATCH-Disable-CrashRecoveryTest.DumpStackCleanup-tes.patch
2.37.1
========
1.8.3.1
>>>>>>>> upstream/rawhide:0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch