Fix another over-long UTF-8 sequence test.
This one forgot to set its locale, so it was passing on glibc (because
the sequence here wasn't valid in its default locale) and failing on
musl, both for the wrong reasons.
Bug: None
Test: ./tests/run-on-host.sh 64 --gtest_filter="uchar.*"
Test: ./tests/run-on-host.sh glibc --gtest_filter="uchar.*"
Test: ./tests/run-on-host.sh musl --gtest_filter="uchar.*"
Change-Id: Ic6bcd1836ba23c7010e2cde673a3beca73778021
diff --git a/tests/uchar_test.cpp b/tests/uchar_test.cpp
index 0114adf..381112d 100644
--- a/tests/uchar_test.cpp
+++ b/tests/uchar_test.cpp
@@ -247,9 +247,20 @@
}
TEST(uchar, mbrtoc16_beyond_range) {
- char16_t out;
- ASSERT_EQ(static_cast<size_t>(-1),
- mbrtoc16(&out, "\xf5\x80\x80\x80", 6, nullptr));
+ ASSERT_STREQ("C.UTF-8", setlocale(LC_CTYPE, "C.UTF-8"));
+
+ errno = 0;
+ char16_t out = u'\0';
+ auto result = mbrtoc16(&out, "\xf5\x80\x80\x80", 6, nullptr);
+ if (kLibcRejectsOverLongUtf8Sequences) {
+ EXPECT_EQ(static_cast<size_t>(-1), result);
+ EXPECT_EQ(u'\0', out);
+ EXPECT_EQ(EILSEQ, errno);
+ } else {
+ EXPECT_EQ(4U, result);
+ EXPECT_EQ(u'\xdcc0', out);
+ EXPECT_EQ(0, errno);
+ }
}
void test_mbrtoc16_incomplete(mbstate_t* ps) {