From 5dfdf2e8d4b7ee0aaa8b1fc8307b11559a2cb710 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 30 Mar 2023 14:07:42 +0200 Subject: [PATCH] rebase of the patches --- .../libcxx/libcxx-silent-test-libcxx.diff | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff index 69330c1c..e6a642b0 100644 --- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff +++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp @@ -11,6 +11,8 @@ // template // RealType generate_canonical(URNG& g); @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/re/re.traits/isctype.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/re/re.traits/isctype.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp @@ -12,6 +12,7 @@ // bool isctype(charT c, char_class_type f) const; @@ -23,23 +23,23 @@ Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxxabi/test/catch_multi_level_pointer.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxxabi/test/catch_multi_level_pointer.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp @@ -11,6 +11,8 @@ // 1b00fc5d8133 made it in the dylib in macOS 10.11 - // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}} + // XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10}} +// XFAIL: * + #include #include #include -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp @@ -15,6 +15,8 @@ // template void construct(T* p, Args&&... args);