rpms/llvm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to an unconditionally applied patch

Browse Source 
It looks like conditionally applying a patch on a single arch is
a bit tricky, so instead use an unconditional patch with an
ifndef __aarch64__ block.
This commit is contained in:
Nikita Popov 2022-01-31 11:57:07 +01:00
parent ddad73a88a
commit 0ff4ac26b1
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Disable-CrashRecoveryTest.DumpStackCleanup-test.patch → 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch
View File

@ -1,7 +1,7 @@
From e52a3e21848a61ec707a88c89cab5ecc61c27146 Mon Sep 17 00:00:00 2001 From 3df079ae29426b4bee3ca11681a41958d72b983a Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com> From: Nikita Popov <npopov@redhat.com>
Date: Mon, 31 Jan 2022 10:33:27 +0100 Date: Mon, 31 Jan 2022 10:33:27 +0100
Subject: [PATCH] Disable CrashRecoveryTest.DumpStackCleanup test Subject: [PATCH] Disable CrashRecoveryTest.DumpStackCleanup test on aarch64
Produces a non-reproducible failure on aarch64: Produces a non-reproducible failure on aarch64:
https://bugzilla.redhat.com/show_bug.cgi?id=2048440 https://bugzilla.redhat.com/show_bug.cgi?id=2048440
@ -10,14 +10,14 @@ https://bugzilla.redhat.com/show_bug.cgi?id=2048440
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/llvm/unittests/Support/CrashRecoveryTest.cpp b/llvm/unittests/Support/CrashRecoveryTest.cpp diff --git a/llvm/unittests/Support/CrashRecoveryTest.cpp b/llvm/unittests/Support/CrashRecoveryTest.cpp
index e95513eb2841..00e701ceb7f5 100644 index e95513eb2841..afb1d3a1f6a2 100644
--- a/llvm/unittests/Support/CrashRecoveryTest.cpp --- a/llvm/unittests/Support/CrashRecoveryTest.cpp
+++ b/llvm/unittests/Support/CrashRecoveryTest.cpp +++ b/llvm/unittests/Support/CrashRecoveryTest.cpp
@@ -76,6 +76,7 @@ TEST(CrashRecoveryTest, Cleanup) { @@ -76,6 +76,7 @@ TEST(CrashRecoveryTest, Cleanup) {
llvm::CrashRecoveryContext::Disable(); llvm::CrashRecoveryContext::Disable();
} }
+#if 0 +#ifndef __aarch64__
TEST(CrashRecoveryTest, DumpStackCleanup) { TEST(CrashRecoveryTest, DumpStackCleanup) {
SmallString<128> Filename; SmallString<128> Filename;
std::error_code EC = sys::fs::createTemporaryFile("crash", "test", Filename); std::error_code EC = sys::fs::createTemporaryFile("crash", "test", Filename);

7
llvm.spec
View File

@ -86,12 +86,7 @@ Source4: lit.fedora.cfg.py
Patch0: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch Patch0: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
%endif %endif
Patch1: 0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch Patch1: 0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch
Patch2: 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch
# Disable the CrashRecoveryTest.DumpStackCleanup test on aarch64 due to a
# non-reproducible failure: https://bugzilla.redhat.com/show_bug.cgi?id=2048440
%ifarch aarch64
Patch2: 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test.patch
%endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++