From f69be329f0d78f19e71ac9e75d6e4ee816e13c97 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sat, 10 Aug 2013 16:27:43 +0200 Subject: v8: upgrade v8 to 3.20.14.1 --- deps/v8/test/intl/break-iterator/default-locale.js | 2 +- .../wellformed-unsupported-locale.js | 2 +- deps/v8/test/intl/collator/default-locale.js | 4 +-- .../intl/collator/wellformed-unsupported-locale.js | 2 +- deps/v8/test/intl/date-format/default-locale.js | 2 +- .../date-format/wellformed-unsupported-locale.js | 2 +- deps/v8/test/intl/general/v8Intl-exists.js | 36 ---------------------- deps/v8/test/intl/intl.status | 10 +----- deps/v8/test/intl/number-format/default-locale.js | 2 +- .../number-format/wellformed-unsupported-locale.js | 2 +- deps/v8/test/intl/testcfg.py | 2 +- 11 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 deps/v8/test/intl/general/v8Intl-exists.js (limited to 'deps/v8/test/intl') diff --git a/deps/v8/test/intl/break-iterator/default-locale.js b/deps/v8/test/intl/break-iterator/default-locale.js index 39a88574fe..d8d5aeadb2 100644 --- a/deps/v8/test/intl/break-iterator/default-locale.js +++ b/deps/v8/test/intl/break-iterator/default-locale.js @@ -38,7 +38,7 @@ assertFalse(options.locale === ''); assertFalse(options.locale === undefined); // Then check for equality. -assertEquals(options.locale, getDefaultLocale()); +assertEquals(options.locale, %GetDefaultICULocale()); var iteratorNone = new Intl.v8BreakIterator(); assertEquals(options.locale, iteratorNone.resolvedOptions().locale); diff --git a/deps/v8/test/intl/break-iterator/wellformed-unsupported-locale.js b/deps/v8/test/intl/break-iterator/wellformed-unsupported-locale.js index 56457b4829..5ac8fbcd41 100644 --- a/deps/v8/test/intl/break-iterator/wellformed-unsupported-locale.js +++ b/deps/v8/test/intl/break-iterator/wellformed-unsupported-locale.js @@ -29,4 +29,4 @@ var iterator = Intl.v8BreakIterator(['xx']); -assertEquals(iterator.resolvedOptions().locale, getDefaultLocale()); +assertEquals(iterator.resolvedOptions().locale, %GetDefaultICULocale()); diff --git a/deps/v8/test/intl/collator/default-locale.js b/deps/v8/test/intl/collator/default-locale.js index f6ffba8e1d..db9b1e7330 100644 --- a/deps/v8/test/intl/collator/default-locale.js +++ b/deps/v8/test/intl/collator/default-locale.js @@ -38,7 +38,7 @@ assertFalse(options.locale === ''); assertFalse(options.locale === undefined); // Then check for equality. -assertEquals(options.locale, getDefaultLocale()); +assertEquals(options.locale, %GetDefaultICULocale()); var collatorNone = new Intl.Collator(); assertEquals(options.locale, collatorNone.resolvedOptions().locale); @@ -48,5 +48,5 @@ var collatorBraket = new Intl.Collator({}); assertEquals(options.locale, collatorBraket.resolvedOptions().locale); var collatorWithOptions = new Intl.Collator(undefined, {usage: 'search'}); -assertEquals(getDefaultLocale() + '-u-co-search', +assertEquals(%GetDefaultICULocale() + '-u-co-search', collatorWithOptions.resolvedOptions().locale); diff --git a/deps/v8/test/intl/collator/wellformed-unsupported-locale.js b/deps/v8/test/intl/collator/wellformed-unsupported-locale.js index ea143fdc63..3963d47a61 100644 --- a/deps/v8/test/intl/collator/wellformed-unsupported-locale.js +++ b/deps/v8/test/intl/collator/wellformed-unsupported-locale.js @@ -29,4 +29,4 @@ var collator = Intl.Collator(['xx']); -assertEquals(collator.resolvedOptions().locale, getDefaultLocale()); +assertEquals(collator.resolvedOptions().locale, %GetDefaultICULocale()); diff --git a/deps/v8/test/intl/date-format/default-locale.js b/deps/v8/test/intl/date-format/default-locale.js index 2dcb0f8ae7..8e9b7fcec3 100644 --- a/deps/v8/test/intl/date-format/default-locale.js +++ b/deps/v8/test/intl/date-format/default-locale.js @@ -38,7 +38,7 @@ assertFalse(options.locale === ''); assertFalse(options.locale === undefined); // Then check for equality. -assertEquals(options.locale, getDefaultLocale()); +assertEquals(options.locale, %GetDefaultICULocale()); var dtfNone = new Intl.DateTimeFormat(); assertEquals(options.locale, dtfNone.resolvedOptions().locale); diff --git a/deps/v8/test/intl/date-format/wellformed-unsupported-locale.js b/deps/v8/test/intl/date-format/wellformed-unsupported-locale.js index 8867ec6442..6f063abbd1 100644 --- a/deps/v8/test/intl/date-format/wellformed-unsupported-locale.js +++ b/deps/v8/test/intl/date-format/wellformed-unsupported-locale.js @@ -29,4 +29,4 @@ var dtf = Intl.DateTimeFormat(['xx']); -assertEquals(dtf.resolvedOptions().locale, getDefaultLocale()); +assertEquals(dtf.resolvedOptions().locale, %GetDefaultICULocale()); diff --git a/deps/v8/test/intl/general/v8Intl-exists.js b/deps/v8/test/intl/general/v8Intl-exists.js deleted file mode 100644 index 610767e376..0000000000 --- a/deps/v8/test/intl/general/v8Intl-exists.js +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2013 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Make sure that v8Intl is mapped into Intl for backward compatibility. - -assertEquals(v8Intl, Intl); - -// Extra checks. -assertTrue(v8Intl.hasOwnProperty('DateTimeFormat')); -assertTrue(v8Intl.hasOwnProperty('NumberFormat')); -assertTrue(v8Intl.hasOwnProperty('Collator')); -assertTrue(v8Intl.hasOwnProperty('v8BreakIterator')); diff --git a/deps/v8/test/intl/intl.status b/deps/v8/test/intl/intl.status index 913626b1f4..7ef0abb4d2 100644 --- a/deps/v8/test/intl/intl.status +++ b/deps/v8/test/intl/intl.status @@ -27,15 +27,7 @@ prefix intl -# The following tests use getDefaultLocale() or getDefaultTimezone(). -break-iterator/default-locale: FAIL -break-iterator/wellformed-unsupported-locale: FAIL -collator/default-locale: FAIL -collator/wellformed-unsupported-locale: FAIL -date-format/default-locale: FAIL +# The following tests use getDefaultTimeZone(). date-format/resolved-options: FAIL date-format/timezone: FAIL -date-format/wellformed-unsupported-locale: FAIL general/v8Intl-exists: FAIL -number-format/default-locale: FAIL -number-format/wellformed-unsupported-locale: FAIL diff --git a/deps/v8/test/intl/number-format/default-locale.js b/deps/v8/test/intl/number-format/default-locale.js index 0d5e24dd70..cd67ba724f 100644 --- a/deps/v8/test/intl/number-format/default-locale.js +++ b/deps/v8/test/intl/number-format/default-locale.js @@ -38,7 +38,7 @@ assertFalse(options.locale === ''); assertFalse(options.locale === undefined); // Then check for equality. -assertEquals(options.locale, getDefaultLocale()); +assertEquals(options.locale, %GetDefaultICULocale()); var nfNone = new Intl.NumberFormat(); assertEquals(options.locale, nfNone.resolvedOptions().locale); diff --git a/deps/v8/test/intl/number-format/wellformed-unsupported-locale.js b/deps/v8/test/intl/number-format/wellformed-unsupported-locale.js index e3fe9cc087..195eba4c19 100644 --- a/deps/v8/test/intl/number-format/wellformed-unsupported-locale.js +++ b/deps/v8/test/intl/number-format/wellformed-unsupported-locale.js @@ -29,4 +29,4 @@ var nf = Intl.NumberFormat(['xx']); -assertEquals(nf.resolvedOptions().locale, getDefaultLocale()); +assertEquals(nf.resolvedOptions().locale, %GetDefaultICULocale()); diff --git a/deps/v8/test/intl/testcfg.py b/deps/v8/test/intl/testcfg.py index d25683bed2..09d29d0bee 100644 --- a/deps/v8/test/intl/testcfg.py +++ b/deps/v8/test/intl/testcfg.py @@ -52,7 +52,7 @@ class IntlTestSuite(testsuite.TestSuite): return tests def GetFlagsForTestCase(self, testcase, context): - flags = [] + context.mode_flags + flags = ["--allow-natives-syntax"] + context.mode_flags files = [] files.append(os.path.join(self.root, "assert.js")) -- cgit v1.2.3