From adc6f41d0efa56decdc1ae4cb2b647418d4c8e6c Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Fri, 12 Oct 2012 03:19:08 +0000 Subject: [PATCH] ICU-9581 Update ICU version to 50.1, update timebombs for #9156,#9490,#8982,ccldrbug3058 X-SVN-Rev: 32616 --- icu4c/source/common/unicode/uvernum.h | 8 ++++---- icu4c/source/data/misc/icuver.txt | 4 ++-- icu4c/source/test/cintltst/cldrtest.c | 2 +- icu4c/source/test/cintltst/cmsccoll.c | 2 +- icu4c/source/test/cintltst/creststn.c | 2 +- icu4c/source/test/intltest/ssearch.cpp | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index ad5a3c186f9..9e260139e81 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -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 2 +#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 "50.0.2" +#define U_ICU_VERSION "50.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 "50.0.2" +#define U_ICU_DATA_VERSION "50.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 64943dbd2c5..e2e27487f85 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -6,6 +6,6 @@ // *************************************************************************** icuver:table(nofallback){ - DataVersion { "50.0.1.0" } - ICUVersion { "50.0.1.0" } + DataVersion { "50.1.0.0" } + ICUVersion { "50.1.0.0" } } diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index 86233e66959..e4fdfe8d9d0 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -934,7 +934,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(50, 1, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */ + else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(51, 0, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */ 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", diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c index 93c0d75cba6..9a0f5bc7e80 100644 --- a/icu4c/source/test/cintltst/cmsccoll.c +++ b/icu4c/source/test/cintltst/cmsccoll.c @@ -5172,7 +5172,7 @@ TestTailor6179(void) } log_err("\n"); } -if(isICUVersionAtLeast(50, 1, 0)) { /* TODO: debug & fix, see ticket #8982 */ +if(isICUVersionAtLeast(51, 1, 0)) { /* 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) { diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index af581f58139..8f04f4c2d06 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -281,7 +281,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 */ - if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(50, 1, 0)) { + if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(51, 0, 0)) { status = U_USING_DEFAULT_WARNING; r2 = ures_getByKey(r, "Countries", r2, &status); checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status); diff --git a/icu4c/source/test/intltest/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp index 85fb1bff7b6..deb43a7c94a 100644 --- a/icu4c/source/test/intltest/ssearch.cpp +++ b/icu4c/source/test/intltest/ssearch.cpp @@ -980,8 +980,8 @@ void SSearchTest::offsetTest() col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status); for(int32_t i = 0; i < testCount; i += 1) { - if (!isICUVersionAtLeast(50, 1) && i>=4 && i<=6) { - continue; // timebomb until ticket #8080 is resolved + if (!isICUVersionAtLeast(51, 1) && i>=4 && i<=6) { + continue; // timebomb until ticket #9156 (was #8081) is resolved } UnicodeString ts = CharsToUnicodeString(test[i]); CollationElementIterator *iter = col->createCollationElementIterator(ts); @@ -2414,12 +2414,12 @@ void SSearchTest::bmMonkeyTest(char *params) CollData *data = CollData::open(coll, status); UnicodeSet skipSet; - if(isICUVersionBefore(50, 1)) { - // timebomb until ticket #8080 is resolved + if(isICUVersionBefore(51, 1)) { + // timebomb until ticket #9156 (was #8081) is resolved UnicodeString skipString(skipChars); skipSet.addAll(skipString); } - if(isICUVersionBefore(51, 0)) { + if(isICUVersionBefore(51, 1)) { // Time bomb until ticket #9490 is fixed. skipSet.add(0x12327); skipSet.add(0x1311b); -- 2.49.0