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-9721 Change version number to 51.1 and update timebombs

Browse source 
X-SVN-Rev: 33347
This commit is contained in:
Michael Ow 2013-02-27 21:34:41 +00:00
parent d511789345
commit c7fe946b72
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/common/unicode/uvernum.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2000-2012, International Business Machines
* Copyright (C) 2000-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
@ -63,13 +63,13 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 0
#define U_ICU_VERSION_MINOR_NUM 1
/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION_PATCHLEVEL_NUM 1
#define U_ICU_VERSION_PATCHLEVEL_NUM 0
/** The current ICU build level version as an integer.
* This value is for use by ICU clients. It defaults to 0.
@ -118,7 +118,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "51.0.1"
#define U_ICU_VERSION "51.1"
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
* This value will change in the subsequent releases of ICU
@ -130,7 +130,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "51.0.1"
#define U_ICU_DATA_VERSION "51.1"
#endif /* U_HIDE_INTERNAL_API */
/*===========================================================================

6
icu4c/source/data/misc/icuver.txt
View file

@ -1,11 +1,11 @@
// ***************************************************************************
// *
// * Copyright (C) 2010-2012 International Business Machines
// * Copyright (C) 2010-2013 International Business Machines
// * Corporation and others. All Rights Reserved.
// *
// ***************************************************************************
icuver:table(nofallback){
DataVersion { "50.1.0.0" }
ICUVersion { "50.1.0.0" }
DataVersion { "51.1.0.0" }
ICUVersion { "51.1.0.0" }
}

6
icu4c/source/test/cintltst/cldrtest.c
View file

@ -937,7 +937,7 @@ static void VerifyTranslation(void) {
if (U_FAILURE(errorCode)) {
log_err("error uloc_getDisplayCountry returned %s\n", u_errorName(errorCode));
}
else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(51, 0, 2)) { /* TODO: FIX or REMOVE this test! Was: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) - but CldrBug:3058 is wontfix */
else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! Was: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) - but CldrBug:3058 is wontfix */
strIdx = findStringSetMismatch(currLoc, langBuffer, langSize, exemplarCharacters, exemplarLen, FALSE, &badChar);
if (strIdx >= 0) {
log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n",
@ -968,7 +968,7 @@ static void VerifyTranslation(void) {
log_err("error ures_getStringByIndex(%d) returned %s\n", idx, u_errorName(errorCode));
continue;
}
if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(51, 0, 2)) { /* TODO: FIX or REMOVE this test! */
if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! */
strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar);
if (strIdx >= 0) {
log_err("getDayNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n",
@ -999,7 +999,7 @@ static void VerifyTranslation(void) {
log_err("error ures_getStringByIndex(%d) returned %s\n", idx, u_errorName(errorCode));
continue;
}
if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(51, 0, 2)) { /* TODO: FIX or REMOVE this test! */
if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! */
strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar);
if (strIdx >= 0) {
log_err("getMonthNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n",

2
icu4c/source/test/cintltst/cmsccoll.c
View file

@ -5181,7 +5181,7 @@ TestTailor6179(void)
}
log_err("\n");
}
if(isICUVersionAtLeast(51, 1, 0)) { /* TODO: debug & fix, see ticket #8982 */
if(isICUVersionAtLeast(52, 0, 1)) { /* TODO: debug & fix, see ticket #8982 */
tLen = u_strlen(tData2[1]);
rLen = ucol_getSortKey(coll, tData2[1], tLen, resColl, 100);
if (rLen != LEN(firstSecondaryIgnCE) || uprv_memcmp(resColl, firstSecondaryIgnCE, rLen) != 0) {

4
icu4c/source/test/cintltst/creststn.c
View file

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2012, International Business Machines Corporation and
* Copyright (c) 1997-2013, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -282,7 +282,7 @@ static void TestErrorCodes(void) {
/* we look up the resource which is aliased and at our level */
/* TODO: restore the following test when cldrbug 3058: is fixed - but CldrBug:3058 is WONTFIX */
if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(51, 0, 2)) {
if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(52, 0, 1)) {
status = U_USING_DEFAULT_WARNING;
r2 = ures_getByKey(r, "Countries", r2, &status);
checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);

2
icu4c/source/test/intltest/dtfmttst.cpp
View file

@ -3664,7 +3664,7 @@ void DateFormatTest::TestNumberAsStringParsing()
};
const NumAsStringItem * itemPtr;
for (itemPtr = items; itemPtr->localeStr != NULL; itemPtr++ ) {
if (!isICUVersionAtLeast(51, 0, 2) && itemPtr->localeStr[0] == 0 && itemPtr->lenient == FALSE) {
if (!isICUVersionAtLeast(52, 0, 1) && itemPtr->localeStr[0] == 0 && itemPtr->lenient == FALSE) {
continue; // Time-bomb added per #9925, fix per #9975
}
Locale locale = Locale::createFromName(itemPtr->localeStr);

2
icu4c/source/test/intltest/ssearch.cpp
View file

@ -629,7 +629,7 @@ void SSearchTest::offsetTest()
col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status);
for(int32_t i = 0; i < testCount; i += 1) {
if (!isICUVersionAtLeast(51, 1) && i>=4 && i<=6) {
if (!isICUVersionAtLeast(52, 0, 1) && i>=4 && i<=6) {
continue; // timebomb until ticket #9156 (was #8081) is resolved
}
UnicodeString ts = CharsToUnicodeString(test[i]);