Skip to content

Commit

Permalink
Fix a patch conflict in libc++ tests.
Browse files Browse the repository at this point in the history
One of our xfailed tests has been fixed, and the patch adding the
xfail comment was causing a conflict.
  • Loading branch information
statham-arm committed Sep 2, 2024
1 parent 20834fd commit 7616f8c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 44 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ endif()
# ed551e0778a35f00ab60f1c80d83ea8274d8d400.
set(
llvm_project_patches
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-two-remaining-tests.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0002-libc-tests-with-picolibc-disable-large-tests.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch
${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0004-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch
Expand Down
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

This file was deleted.

0 comments on commit 7616f8c

Please sign in to comment.