diff --git a/DEPS b/DEPS index ecba06c44c..7019244f89 100644 --- a/DEPS +++ b/DEPS @@ -61,7 +61,7 @@ deps = { 'v8/third_party/depot_tools': Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '788d9e0de8132ff47891a9c141436ac6739e2e9f', 'v8/third_party/icu': - Var('chromium_url') + '/chromium/deps/icu.git' + '@' + '9f0f47b1e410b137762f2e3699359f0dbfcdbc05', + Var('chromium_url') + '/chromium/deps/icu.git' + '@' + 'fd97d4326fac6da84452b2d5fe75ff0949368dab', 'v8/third_party/instrumented_libraries': Var('chromium_url') + '/chromium/src/third_party/instrumented_libraries.git' + '@' + '523c0fd6b600c434668e70cd9be270a8589d60ed', 'v8/buildtools': diff --git a/test/intl/relative-time-format/format-en.js b/test/intl/relative-time-format/format-en.js index a365749f0a..d802902587 100644 --- a/test/intl/relative-time-format/format-en.js +++ b/test/intl/relative-time-format/format-en.js @@ -23,8 +23,8 @@ assertEquals('in 345 seconds', longAuto.format(345, 'second')); assertEquals('3 minutes ago', longAuto.format(-3, 'minute')); assertEquals('2 minutes ago', longAuto.format(-2, 'minute')); assertEquals('1 minute ago', longAuto.format(-1, 'minute')); -assertEquals('in 0 minutes', longAuto.format(0, 'minute')); -assertEquals('0 minutes ago', longAuto.format(-0, 'minute')); +assertEquals('this minute', longAuto.format(0, 'minute')); +assertEquals('this minute', longAuto.format(-0, 'minute')); assertEquals('in 1 minute', longAuto.format(1, 'minute')); assertEquals('in 2 minutes', longAuto.format(2, 'minute')); assertEquals('in 345 minutes', longAuto.format(345, 'minute')); @@ -32,8 +32,8 @@ assertEquals('in 345 minutes', longAuto.format(345, 'minute')); assertEquals('3 hours ago', longAuto.format(-3, 'hour')); assertEquals('2 hours ago', longAuto.format(-2, 'hour')); assertEquals('1 hour ago', longAuto.format(-1, 'hour')); -assertEquals('in 0 hours', longAuto.format(0, 'hour')); -assertEquals('0 hours ago', longAuto.format(-0, 'hour')); +assertEquals('this hour', longAuto.format(0, 'hour')); +assertEquals('this hour', longAuto.format(-0, 'hour')); assertEquals('in 1 hour', longAuto.format(1, 'hour')); assertEquals('in 2 hours', longAuto.format(2, 'hour')); assertEquals('in 345 hours', longAuto.format(345, 'hour')); @@ -98,8 +98,8 @@ assertEquals('in 345 sec.', shortAuto.format(345, 'second')); assertEquals('3 min. ago', shortAuto.format(-3, 'minute')); assertEquals('2 min. ago', shortAuto.format(-2, 'minute')); assertEquals('1 min. ago', shortAuto.format(-1, 'minute')); -assertEquals('in 0 min.', shortAuto.format(0, 'minute')); -assertEquals('0 min. ago', shortAuto.format(-0, 'minute')); +assertEquals('this minute', shortAuto.format(0, 'minute')); +assertEquals('this minute', shortAuto.format(-0, 'minute')); assertEquals('in 1 min.', shortAuto.format(1, 'minute')); assertEquals('in 2 min.', shortAuto.format(2, 'minute')); assertEquals('in 345 min.', shortAuto.format(345, 'minute')); @@ -107,8 +107,8 @@ assertEquals('in 345 min.', shortAuto.format(345, 'minute')); assertEquals('3 hr. ago', shortAuto.format(-3, 'hour')); assertEquals('2 hr. ago', shortAuto.format(-2, 'hour')); assertEquals('1 hr. ago', shortAuto.format(-1, 'hour')); -assertEquals('in 0 hr.', shortAuto.format(0, 'hour')); -assertEquals('0 hr. ago', shortAuto.format(-0, 'hour')); +assertEquals('this hour', shortAuto.format(0, 'hour')); +assertEquals('this hour', shortAuto.format(-0, 'hour')); assertEquals('in 1 hr.', shortAuto.format(1, 'hour')); assertEquals('in 2 hr.', shortAuto.format(2, 'hour')); assertEquals('in 345 hr.', shortAuto.format(345, 'hour')); @@ -174,8 +174,8 @@ assertEquals('in 345 sec.', narrowAuto.format(345, 'second')); assertEquals('3 min. ago', narrowAuto.format(-3, 'minute')); assertEquals('2 min. ago', narrowAuto.format(-2, 'minute')); assertEquals('1 min. ago', narrowAuto.format(-1, 'minute')); -assertEquals('in 0 min.', narrowAuto.format(0, 'minute')); -assertEquals('0 min. ago', narrowAuto.format(-0, 'minute')); +assertEquals('this minute', narrowAuto.format(0, 'minute')); +assertEquals('this minute', narrowAuto.format(-0, 'minute')); assertEquals('in 1 min.', narrowAuto.format(1, 'minute')); assertEquals('in 2 min.', narrowAuto.format(2, 'minute')); assertEquals('in 345 min.', narrowAuto.format(345, 'minute')); @@ -183,8 +183,8 @@ assertEquals('in 345 min.', narrowAuto.format(345, 'minute')); assertEquals('3 hr. ago', narrowAuto.format(-3, 'hour')); assertEquals('2 hr. ago', narrowAuto.format(-2, 'hour')); assertEquals('1 hr. ago', narrowAuto.format(-1, 'hour')); -assertEquals('in 0 hr.', narrowAuto.format(0, 'hour')); -assertEquals('0 hr. ago', narrowAuto.format(-0, 'hour')); +assertEquals('this hour', narrowAuto.format(0, 'hour')); +assertEquals('this hour', narrowAuto.format(-0, 'hour')); assertEquals('in 1 hr.', narrowAuto.format(1, 'hour')); assertEquals('in 2 hr.', narrowAuto.format(2, 'hour')); assertEquals('in 345 hr.', narrowAuto.format(345, 'hour')); diff --git a/test/test262/test262.status b/test/test262/test262.status index 6f7912276a..3e40d84fe8 100644 --- a/test/test262/test262.status +++ b/test/test262/test262.status @@ -80,6 +80,11 @@ 'intl402/NumberFormat/numbering-system-options': ['--harmony-intl-add-calendar-numbering-system'], 'intl402/DateTimeFormat/numbering-system-calendar-options': ['--harmony-intl-add-calendar-numbering-system'], + # Waiting for test262 to land + # https://bugs.chromium.org/p/v8/issues/detail?id=9327 + 'intl402/RelativeTimeFormat/prototype/formatToParts/en-us-numeric-auto': [FAIL], + 'intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto': [FAIL], + # https://bugs.chromium.org/p/v8/issues/detail?id=9319 'intl402/NumberFormat/prototype/resolvedOptions/order': [FAIL],