From 0ff4ac26b1fad5f13f26834e63ea70b3a8f25d84 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 31 Jan 2022 11:57:07 +0100 Subject: [PATCH] Switch to an unconditionally applied patch 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. --- ...ble-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch | 8 ++++---- llvm.spec | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) rename 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test.patch => 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch (88%) diff --git a/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test.patch b/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch similarity index 88% rename from 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test.patch rename to 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch index 4bb1037..1ddfb0c 100644 --- a/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test.patch +++ b/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch @@ -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 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: 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(+) 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 +++ b/llvm/unittests/Support/CrashRecoveryTest.cpp @@ -76,6 +76,7 @@ TEST(CrashRecoveryTest, Cleanup) { llvm::CrashRecoveryContext::Disable(); } -+#if 0 ++#ifndef __aarch64__ TEST(CrashRecoveryTest, DumpStackCleanup) { SmallString<128> Filename; std::error_code EC = sys::fs::createTemporaryFile("crash", "test", Filename); diff --git a/llvm.spec b/llvm.spec index 7d8e8f5..1d10e96 100644 --- a/llvm.spec +++ b/llvm.spec @@ -86,12 +86,7 @@ Source4: lit.fedora.cfg.py Patch0: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch %endif Patch1: 0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.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 +Patch2: 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch BuildRequires: gcc BuildRequires: gcc-c++