Skip to content

Commit 9d5eb1a

Browse files
committed
[libcxx] Update picolibc version used in CI to 1.8.10
With this change, two xfails have been removed. It also introduces a header inclusion for test macros that was wrongly missed.
1 parent 535197f commit 9d5eb1a

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
// Apple platforms don't provide <uchar.h> yet, so these tests fail.
1212
// XFAIL: target={{.+}}-apple-{{.+}}
1313

14-
// mbrtoc16 not defined.
15-
// XFAIL: LIBCXX-PICOLIBC-FIXME
16-
1714
// <uchar.h>
1815

1916
#include <uchar.h>

libcxx/test/std/depr/depr.c.headers/uchar_h_char8_t.compile.pass.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
// XFAIL: freebsd
1616
// XFAIL: windows
1717
// XFAIL: glibc-no-char8_t-support
18-
// XFAIL: LIBCXX-PICOLIBC-FIXME
1918

2019
// <uchar.h>
2120

2221
#include <uchar.h>
2322

23+
#include "test_macros.h"
24+
2425
ASSERT_SAME_TYPE(size_t, decltype(mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
2526
ASSERT_SAME_TYPE(size_t, decltype(c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));

libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
// Apple platforms don't provide <uchar.h> yet, so these tests fail.
1212
// XFAIL: target={{.+}}-apple-{{.+}}
1313

14-
// mbrtoc16 not defined.
15-
// XFAIL: LIBCXX-PICOLIBC-FIXME
16-
1714
// <cuchar>
1815

1916
#include <cuchar>

libcxx/test/std/strings/c.strings/cuchar_char8_t.compile.pass.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
// XFAIL: freebsd
1616
// XFAIL: windows
1717
// XFAIL: glibc-no-char8_t-support
18-
// XFAIL: LIBCXX-PICOLIBC-FIXME
1918

2019
// <cuchar>
2120

2221
#include <cuchar>
2322

23+
#include "test_macros.h"
24+
2425
ASSERT_SAME_TYPE(std::size_t, decltype(std::mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
2526
ASSERT_SAME_TYPE(std::size_t, decltype(std::c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));

libcxx/utils/ci/build-picolibc.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ picolibc_source_dir="${build_dir}/picolibc-source"
6969
picolibc_build_dir="${build_dir}/picolibc-build"
7070
mkdir -p "${picolibc_source_dir}"
7171
mkdir -p "${picolibc_build_dir}"
72-
# Download a known good version of picolibc.
73-
picolibc_commit="48fbc2009c6473293d03d5ec6f190565c6223a5c"
72+
# Download a known good version of picolibc: v1.8.10
73+
picolibc_commit="51a8b32857e75345c37652a80b5cda98b28d69e5"
7474
curl -L "https://github.com/picolibc/picolibc/archive/${picolibc_commit}.zip" --output "${picolibc_source_dir}/picolibc.zip"
7575
unzip -q "${picolibc_source_dir}/picolibc.zip" -d "${picolibc_source_dir}"
7676
mv "${picolibc_source_dir}/picolibc-${picolibc_commit}"/* "${picolibc_source_dir}"

0 commit comments

Comments
 (0)