-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix a patch conflict in libc++ tests.
One of our xfailed tests has been fixed, and the patch adding the xfail comment was causing a conflict.
- Loading branch information
1 parent
20834fd
commit 7616f8c
Showing
3 changed files
with
27 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 1db48238bfbc5324dadf828532a4c67524dc471b Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <dominik.wojt@arm.com> | ||
Date: Mon, 16 Oct 2023 11:35:48 +0200 | ||
Subject: [PATCH] [libc++] tests with picolibc: xfail one remaining test | ||
|
||
--- | ||
.../language.support/support.start.term/quick_exit.pass.cpp | 3 +++ | ||
1 file changed, 3 insertions(+) | ||
|
||
diff --git a/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp b/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp | ||
index d8eff69cb5..e16048df72 100644 | ||
--- a/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp | ||
+++ b/libcxx/test/std/language.support/support.start.term/quick_exit.pass.cpp | ||
@@ -17,6 +17,9 @@ | ||
|
||
// test quick_exit and at_quick_exit | ||
|
||
+// TODO: Find out why the at_quick_exit symbol is not found. | ||
+// XFAIL: LIBCXX-PICOLIBC-FIXME | ||
+ | ||
#include <cstdlib> | ||
|
||
void f() {} | ||
-- | ||
2.34.1 | ||
|
43 changes: 0 additions & 43 deletions
43
patches/llvm-project/0001-libc-tests-with-picolibc-xfail-two-remaining-tests.patch
This file was deleted.
Oops, something went wrong.