From eca42c42cb6508b7979f70722a4c3632bf54843e Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Wed, 18 Sep 2013 13:50:00 +0000 Subject: [PATCH] Revert "Turn on i18n support by default", "Update test262 expectations, now that 15.5.4.9_CE passes", "Make testing i18n the default.", "Mark two failing mozilla tests as failing.", "Mark mozilla tests as flaky instead of failing" and "Fix test expectations for i18n." This reverts commit 16783-16788 due to several crashers on nosnap builder. TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/23455055 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16789 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- Makefile | 9 ++++----- Makefile.nacl | 3 --- build/features.gypi | 2 +- build/standalone.gypi | 2 +- samples/samples.gyp | 2 +- src/d8.gyp | 2 +- test/intl/intl.status | 4 ---- test/mozilla/mozilla.status | 6 ------ test/test262/test262.status | 7 ++++--- tools/run-tests.py | 5 ----- 10 files changed, 12 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index bcf3bcc..288c257 100644 --- a/Makefile +++ b/Makefile @@ -124,10 +124,9 @@ endif ifeq ($(regexp), interpreted) GYPFLAGS += -Dv8_interpreted_regexp=1 endif -# i18nsupport=off -ifeq ($(i18nsupport), off) - GYPFLAGS += -Dv8_enable_i18n_support=0 - TESTFLAGS += --noi18n +# i18nsupport=on +ifeq ($(i18nsupport), on) + GYPFLAGS += -Dv8_enable_i18n_support=1 endif # arm specific flags. # armv7=false/true @@ -332,7 +331,7 @@ $(addsuffix .check, $(ANDROID_ARCHES)): \ $(addsuffix .check, $(NACL_BUILDS)): $$(basename $$@) @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \ --arch-and-mode=$(basename $@) \ - --timeout=600 --nopresubmit --noi18n \ + --timeout=600 --nopresubmit \ --command-prefix="tools/nacl-run.py" $(addsuffix .check, $(NACL_ARCHES)): \ diff --git a/Makefile.nacl b/Makefile.nacl index 2c79ef1..02e83ef 100644 --- a/Makefile.nacl +++ b/Makefile.nacl @@ -74,9 +74,6 @@ endif # For mksnapshot host generation. GYPENV += host_os=${HOST_OS} -# ICU doesn't support NaCl. -GYPENV += v8_enable_i18n_support=0 - NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_ARCHES)) .SECONDEXPANSION: # For some reason the $$(basename $$@) expansion didn't work here... diff --git a/build/features.gypi b/build/features.gypi index 5343284..3c6d25f 100644 --- a/build/features.gypi +++ b/build/features.gypi @@ -54,7 +54,7 @@ # Enable ECMAScript Internationalization API. Enabling this feature will # add a dependency on the ICU library. - 'v8_enable_i18n_support%': 1, + 'v8_enable_i18n_support%': 0, }, 'target_defaults': { 'conditions': [ diff --git a/build/standalone.gypi b/build/standalone.gypi index 3d4f804..f183331 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -36,7 +36,7 @@ 'clang%': 0, 'visibility%': 'hidden', 'v8_enable_backtrace%': 0, - 'v8_enable_i18n_support%': 1, + 'v8_enable_i18n_support%': 0, 'msvs_multi_core_compile%': '1', 'mac_deployment_target%': '10.5', 'variables': { diff --git a/samples/samples.gyp b/samples/samples.gyp index dfc7410..c93deca 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -28,7 +28,7 @@ { 'variables': { 'v8_code': 1, - 'v8_enable_i18n_support%': 1, + 'v8_enable_i18n_support%': 0, }, 'includes': ['../build/toolchain.gypi', '../build/features.gypi'], 'target_defaults': { diff --git a/src/d8.gyp b/src/d8.gyp index 097abc0..c033fd7 100644 --- a/src/d8.gyp +++ b/src/d8.gyp @@ -31,7 +31,7 @@ 'console%': '', # Enable support for Intel VTune. Supported on ia32/x64 only 'v8_enable_vtunejit%': 0, - 'v8_enable_i18n_support%': 1, + 'v8_enable_i18n_support%': 0, }, 'includes': ['../build/toolchain.gypi', '../build/features.gypi'], 'targets': [ diff --git a/test/intl/intl.status b/test/intl/intl.status index 89afb9d..34610a5 100644 --- a/test/intl/intl.status +++ b/test/intl/intl.status @@ -34,7 +34,3 @@ general/v8Intl-exists: FAIL # TODO(jochen): The following test is flaky. overrides/caching: PASS || FAIL - -# TODO(jochen): These tests started to fail on mac after i18n support was -# turned on. Need to investigate why. -collator/default-locale: PASS || FAIL diff --git a/test/mozilla/mozilla.status b/test/mozilla/mozilla.status index bf1578f..9878730 100644 --- a/test/mozilla/mozilla.status +++ b/test/mozilla/mozilla.status @@ -45,12 +45,6 @@ prefix mozilla def FAIL_OK = FAIL, OKAY -##################### NEEDS INVESTIGATION ############## - -# BUG(2893): These tests started to fail after i18n support was turned on. Need -# to investigate why. -ecma_3/Number/15.7.4.3-02: PASS || FAIL -ecma_3/Date/15.9.5.5-02: PASS || FAIL ##################### SKIPPED TESTS ##################### diff --git a/test/test262/test262.status b/test/test262/test262.status index 1b867fb..4910939 100644 --- a/test/test262/test262.status +++ b/test/test262/test262.status @@ -36,9 +36,10 @@ def FAIL_OK = FAIL, OKAY # V8 Bug: http://code.google.com/p/v8/issues/detail?id=691 11.2.3-3_3: FAIL -# BUG(2893): These tests started to fail after i18n support was turned on. Need -# to investigate why. -15.5.4.9_3: PASS || FAIL +# Strings that are considered canonically equivalent by the Unicode standard +# return a non-zero value on String.prototype.localeCompare calls. +# V8 Bug: http://code.google.com/p/v8/issues/detail?id=2413 +15.5.4.9_CE: FAIL ##################### DELIBERATE INCOMPATIBILITIES ##################### diff --git a/tools/run-tests.py b/tools/run-tests.py index d023cf1..48682d4 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -112,9 +112,6 @@ def BuildOptions(): result.add_option("-m", "--mode", help="The test modes in which to run (comma-separated)", default="release,debug") - result.add_option("--no-i18n", "--noi18n", - help="Skip internationalization tests", - default=False, action="store_true") result.add_option("--no-network", "--nonetwork", help="Don't distribute tests on the network", default=(utils.GuessOS() != "linux"), @@ -213,8 +210,6 @@ def ProcessOptions(options): if not options.flaky_tests in ["run", "skip", "dontcare"]: print "Unknown flaky test mode %s" % options.flaky_tests return False - if not options.no_i18n: - DEFAULT_TESTS.append("intl") return True -- 2.7.4