Skip to content

Commit 0eea082

Browse files
committed
Changes:
- Add android to xfail. - Test char8_t unconditionally.
1 parent 678c833 commit 0eea082

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// The following platforms do not provide mbrtoc8 and c8rtomb so the tests fail
1212
// XFAIL: target={{.+}}-aix{{.*}}
13+
// XFAIL: android
1314
// XFAIL: darwin
1415
// XFAIL: freebsd
1516
// XFAIL: windows
@@ -19,9 +20,5 @@
1920

2021
#include <uchar.h>
2122

22-
#include "test_macros.h"
23-
24-
#if !defined(TEST_HAS_NO_C8RTOMB_MBRTOC8)
2523
ASSERT_SAME_TYPE(size_t, decltype(mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
2624
ASSERT_SAME_TYPE(size_t, decltype(c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
27-
#endif

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// The following platforms do not provide mbrtoc8 and c8rtomb so the tests fail
1212
// XFAIL: target={{.+}}-aix{{.*}}
13+
// XFAIL: android
1314
// XFAIL: darwin
1415
// XFAIL: freebsd
1516
// XFAIL: windows
@@ -19,9 +20,5 @@
1920

2021
#include <cuchar>
2122

22-
#include "test_macros.h"
23-
24-
#if !defined(TEST_HAS_NO_C8RTOMB_MBRTOC8)
2523
ASSERT_SAME_TYPE(std::size_t, decltype(std::mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
2624
ASSERT_SAME_TYPE(std::size_t, decltype(std::c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
27-
#endif

0 commit comments

Comments
 (0)