From 32654fc8276ec6e5d996b5da27c51d57b1c77bfb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 Dec 2021 21:39:11 +0100 Subject: [PATCH] rebase of the patches --- .../libcxx/libcxx-silent-failure-arm64.diff | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff index 5c046056..e6ebc25b 100644 --- a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff +++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff @@ -1,19 +1,19 @@ -Index: llvm-toolchain-snapshot_14~++20211029125545+154c036ebb9b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +Index: llvm-toolchain-snapshot_14~++20211201091932+8d1759c404c7/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20211029125545+154c036ebb9b.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -+++ llvm-toolchain-snapshot_14~++20211029125545+154c036ebb9b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +--- llvm-toolchain-snapshot_14~++20211201091932+8d1759c404c7.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211201091932+8d1759c404c7/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp @@ -8,6 +8,7 @@ // // UNSUPPORTED: libcpp-has-no-threads // ALLOW_RETRIES: 2 +// XFAIL: * - // TODO(ldionne): This test fails on Ubuntu Focal on our CI nodes (and only there), in 32 bit mode. - // UNSUPPORTED: linux && 32bits-on-64bits -Index: llvm-toolchain-snapshot_14~++20211029125545+154c036ebb9b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp + // + +Index: llvm-toolchain-snapshot_14~++20211201091932+8d1759c404c7/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20211029125545+154c036ebb9b.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -+++ llvm-toolchain-snapshot_14~++20211029125545+154c036ebb9b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +--- llvm-toolchain-snapshot_14~++20211201091932+8d1759c404c7.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211201091932+8d1759c404c7/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp @@ -11,7 +11,7 @@ // ALLOW_RETRIES: 2 @@ -21,5 +21,5 @@ Index: llvm-toolchain-snapshot_14~++20211029125545+154c036ebb9b/libcxx/test/std/ -// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} +// XFAIL: * - // TODO(ldionne): This test fails on Ubuntu Focal on our CI nodes (and only there), in 32 bit mode. - // UNSUPPORTED: linux && 32bits-on-64bits + // +