AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-8428 ICU4C and data version to 4.8. Also moved time bombs.

Browse Source 
X-SVN-Rev: 30049
This commit is contained in:
Yoshito Umaoka 2011-05-06 20:45:10 +00:00
parent 3ed970f1a7
commit 62201ee859
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
icu4c/source/common/unicode/uvernum.h
View File

@ -54,13 +54,13 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 7
#define U_ICU_VERSION_MINOR_NUM 8
/** 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.
@ -74,7 +74,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_SUFFIX _47
#define U_ICU_VERSION_SUFFIX _48
/** Glued version suffix function for renamers
* This value will change in the subsequent releases of ICU.
@ -83,7 +83,7 @@
* @stable ICU 4.2
*/
#ifndef U_ICU_ENTRY_POINT_RENAME
#define U_ICU_ENTRY_POINT_RENAME(x) x ## _47
#define U_ICU_ENTRY_POINT_RENAME(x) x ## _48
#endif
/** The current ICU library version as a dotted-decimal string. The patchlevel
@ -91,18 +91,18 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "4.7.1"
#define U_ICU_VERSION "4.8"
/** 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
* @stable ICU 2.6
*/
#define U_ICU_VERSION_SHORT "47"
#define U_ICU_VERSION_SHORT "48"
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "4.7.1"
#define U_ICU_DATA_VERSION "4.8"
/*===========================================================================
* ICU collation framework version information

4
icu4c/source/data/misc/icuver.txt
View File

@ -6,6 +6,6 @@
// ***************************************************************************
icuver:table(nofallback){
DataVersion { "4.7.1.0" }
ICUVersion { "4.7.1.0" }
DataVersion { "4.8.0.0" }
ICUVersion { "4.8.0.0" }
}

4
icu4c/source/test/cintltst/cldrtest.c
View File

@ -867,7 +867,7 @@ findSetMatch( UScriptCode *scriptCodes, int32_t scriptsLen,
}
static void VerifyTranslation(void) {
static const UVersionInfo icu47 = { 4, 7, 2, 0 };
static const UVersionInfo icu49 = { 4, 9, 0, 0 };
UResourceBundle *root, *currentLocale;
int32_t locCount = uloc_countAvailable();
int32_t locIndex;
@ -938,7 +938,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(icu47)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */
else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(icu49)) { /* 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",

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

@ -250,7 +250,7 @@ static void checkStatus(int32_t line, UErrorCode expected, UErrorCode status) {
}
static void TestErrorCodes(void) {
static const UVersionInfo icu47 = { 4, 7, 2, 0 };
static const UVersionInfo icu49 = { 4, 9, 0, 0 };
UErrorCode status = U_USING_DEFAULT_WARNING;
UResourceBundle *r = NULL, *r2 = NULL;
@ -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 */
if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(icu47)) {
if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(icu49)) {
status = U_USING_DEFAULT_WARNING;
r2 = ures_getByKey(r, "Countries", r2, &status);
checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);

6
icu4c/source/test/intltest/rbbitst.cpp
View File

@ -2202,8 +2202,8 @@ void RBBITest::TestUnicodeFiles() {
void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *bi) {
#if !UCONFIG_NO_REGULAR_EXPRESSIONS
// TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb.
UVersionInfo icu472 = { 4, 7, 2, 0 };
UBool isICUVersionPast471 = isICUVersionAtLeast(icu472);
UVersionInfo icu49 = { 4, 9, 0, 0 };
UBool isICUVersionPast48 = isICUVersionAtLeast(icu49);
UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt");
UErrorCode status = U_ZERO_ERROR;
@ -2299,7 +2299,7 @@ UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt");
//
if (testString.length() > 0) {
// TODO(andy): Remove this time bomb code.
if (!isLineBreak || isICUVersionPast471 || !(4658 <= lineNumber && lineNumber <= 4758)) {
if (!isLineBreak || isICUVersionPast48 || !(4658 <= lineNumber && lineNumber <= 4758)) {
checkUnicodeTestCase(fileName, lineNumber, testString, &breakPositions, bi);
}
}

8
icu4c/source/test/intltest/ssearch.cpp
View File

@ -904,7 +904,7 @@ static char *printOrders(char *buffer, OrderList &list)
void SSearchTest::offsetTest()
{
static const UVersionInfo icu47 = { 4, 7, 2, 0 };
static const UVersionInfo icu49 = { 4, 9, 0, 0 };
const char *test[] = {
// The sequence \u0FB3\u0F71\u0F71\u0F80 contains a discontiguous
// contraction (\u0FB3\u0F71\u0F80) logically followed by \u0F71.
@ -981,7 +981,7 @@ void SSearchTest::offsetTest()
col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status);
for(int32_t i = 0; i < testCount; i += 1) {
if (!isICUVersionAtLeast(icu47) && i>=4 && i<=6) {
if (!isICUVersionAtLeast(icu49) && i>=4 && i<=6) {
continue; // timebomb until ticket #8080 is resolved
}
UnicodeString ts = CharsToUnicodeString(test[i]);
@ -2342,7 +2342,7 @@ void SSearchTest::monkeyTest(char *params)
void SSearchTest::bmMonkeyTest(char *params)
{
static const UVersionInfo icu47 = { 4, 7, 2, 0 }; // for timebomb
static const UVersionInfo icu49 = { 4, 9, 0, 0 }; // for timebomb
static const UChar skipChars[] = { 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0xAAB5, 0xAAB6, 0xAAB9, 0xAABB, 0xAABC, 0 }; // for timebomb
// ook!
UErrorCode status = U_ZERO_ERROR;
@ -2448,7 +2448,7 @@ void SSearchTest::bmMonkeyTest(char *params)
generateTestCase(coll, monkeys, monkeyCount, prefix, altPrefix);
generateTestCase(coll, monkeys, monkeyCount, suffix, altSuffix);
if (!isICUVersionAtLeast(icu47) && skipSet->containsSome(pattern)) {
if (!isICUVersionAtLeast(icu49) && skipSet->containsSome(pattern)) {
continue; // timebomb until ticket #8080 is resolved
}