diff options
author | Zach van Rijn <me@zv.io> | 2022-05-04 02:29:10 +0000 |
---|---|---|
committer | Zach van Rijn <me@zv.io> | 2022-05-06 12:37:31 -0500 |
commit | 3a5cecce918dd66ee1e2f1192a3ef3bee1073962 (patch) | |
tree | fb975393aad73b294429ed79d9db42ac28d6eeff /system/icu/tests.patch | |
parent | 40230937a9c30f784bb3c5e17e51702236d2e36f (diff) | |
download | packages-3a5cecce918dd66ee1e2f1192a3ef3bee1073962.tar.gz packages-3a5cecce918dd66ee1e2f1192a3ef3bee1073962.tar.bz2 packages-3a5cecce918dd66ee1e2f1192a3ef3bee1073962.tar.xz packages-3a5cecce918dd66ee1e2f1192a3ef3bee1073962.zip |
system/icu: bump { 70.1 --> 71.1 }.
Diffstat (limited to 'system/icu/tests.patch')
-rw-r--r-- | system/icu/tests.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/system/icu/tests.patch b/system/icu/tests.patch deleted file mode 100644 index 499b8ec2e..000000000 --- a/system/icu/tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream report: https://unicode-org.atlassian.net/browse/ICU-21793 - -From 1b84ce27b41067e8f913da074917a1f6f9831fb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org> -Date: Wed, 3 Nov 2021 02:31:18 +0100 -Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff - ---- - icu4c/source/tools/toolutil/toolutil.cpp | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/icu4c/source/tools/toolutil/toolutil.cpp b/icu4c/source/tools/toolutil/toolutil.cpp -index 1fc68aa69c8..a9dc37377a8 100644 ---- a/tools/toolutil/toolutil.cpp -+++ b/tools/toolutil/toolutil.cpp -@@ -228,18 +228,19 @@ uprv_compareGoldenFiles( - std::ifstream ifs(goldenFilePath, std::ifstream::in); - int32_t pos = 0; - char c; -- while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) { -+ while (ifs.get(c) && pos < bufferLen) { - if (c != buffer[pos]) { - // Files differ at this position -- return pos; -+ break; - } - pos++; - } -- if (pos < bufferLen || c != std::char_traits<char>::eof()) { -- // Files are different lengths -- return pos; -+ if (pos == bufferLen && ifs.eof()) { -+ // Files are same lengths -+ pos = -1; - } -- return -1; -+ ifs.close(); -+ return pos; - } - - /*U_CAPI UDate U_EXPORT2 |