organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 15:42:14 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-9711 fix makefile and another test for OS/400

Browse source 
X-SVN-Rev: 32743
This commit is contained in:
Steven R. Loomis 2012-11-02 20:16:27 +00:00
parent f2306f2577
commit 899e8cf57c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/config/mh-os400
View file

@ -1,8 +1,12 @@
## -*-makefile-*-
## OS400-specific setup (for cross build)
## Copyright (c) 1999-2011, International Business Machines Corporation and
## Copyright (c) 1999-2012, International Business Machines Corporation and
## others. All Rights Reserved.
# This otherwise breaks on OS400 - can't find "shell"
CURR_FULL_DIR=.
CURR_SRCCODE_FULL_DIR=.
GEN_DEPS.c= $(CC1) -E -M $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX1) -E -M $(DEFS) $(CPPFLAGS)

10
icu4c/source/test/intltest/plurfmts.cpp
View file

@ -587,17 +587,17 @@ PluralFormatTest::ordinalFormatTest(void) {
if (errorCode.logDataIfFailureAndReset("PluralFormat(en, UPLURAL_TYPE_ORDINAL, pattern) failed")) {
return;
}
UnicodeString result = pf.format(321, errorCode);
UnicodeString result = pf.format((int32_t)321, errorCode);
if (!errorCode.logIfFailureAndReset("PluralFormat.format(321) failed") &&
result != UNICODE_STRING_SIMPLE("321st file")) {
errln(UnicodeString("PluralFormat.format(321) wrong result string: ") + result);
}
result = pf.format(22, errorCode);
result = pf.format((int32_t)22, errorCode);
if (!errorCode.logIfFailureAndReset("PluralFormat.format(22) failed") &&
result != UNICODE_STRING_SIMPLE("22nd file")) {
errln(UnicodeString("PluralFormat.format(22) wrong result string: ") + result);
}
result = pf.format(3, errorCode);
result = pf.format((int32_t)3, errorCode);
if (!errorCode.logIfFailureAndReset("PluralFormat.format(3) failed") &&
result != UNICODE_STRING_SIMPLE("3rd file")) {
errln(UnicodeString("PluralFormat.format(3) wrong result string: ") + result);
@ -609,12 +609,12 @@ PluralFormatTest::ordinalFormatTest(void) {
if (errorCode.logIfFailureAndReset("PluralFormat(en, UPLURAL_TYPE_ORDINAL, pattern) failed")) {
return;
}
result = pf2.format(456, errorCode);
result = pf2.format((int32_t)456, errorCode);
if (!errorCode.logIfFailureAndReset("PluralFormat.format(456) failed") &&
result != UNICODE_STRING_SIMPLE("456th file")) {
errln(UnicodeString("PluralFormat.format(456) wrong result string: ") + result);
}
result = pf2.format(111, errorCode);
result = pf2.format((int32_t)111, errorCode);
if (!errorCode.logIfFailureAndReset("PluralFormat.format(111) failed") &&
result != UNICODE_STRING_SIMPLE("111th file")) {
errln(UnicodeString("PluralFormat.format(111) wrong result string: ") + result);