c1a9e556ca
Reason for revert: Reland with tests marked as off in no-i18n mode Original issue's description: > Revert of [date] Add ICU backend for timezone info behind a flag (patchset #17 id:320001 of https://codereview.chromium.org/2724373002/ ) > > Reason for revert: > Breaks noi18n: > https://build.chromium.org/p/client.v8/builders/V8%20Linux%20-%20noi18n%20-%20debug/builds/13314 > > Original issue's description: > > [date] Add ICU backend for timezone info behind a flag > > > > This patch implements a timezone backend which is based on ICU, rather > > than operating system calls. It can be turned on by passing the > > --icu-timezone-data flag. The goal here is to take advantage of ICU's > > data, which is more complete than the data that some system calls expose. > > For example, without any special code, this patch fixes the time zone > > of Lord Howe Island to have a correct 30 minute DST offset, rather than > > 60 minutes as the OS backends assume it to have. > > > > Unfortunately, the parenthized timezone name in Date.prototype.toString() > > differs across platforms. This patch chooses the long timezone name, > > which matches Windows behavior and might be the most intelligible, but > > the web compatibility impact is unclear. > > > > BUG=v8:6031,v8:2137,v8:6076 > > > > Review-Url: https://codereview.chromium.org/2724373002 > > Cr-Commit-Position: refs/heads/master@{#44562} > > Committed:b213f23990
> > TBR=ulan@chromium.org,jshin@chromium.org,jgruber@chromium.org,littledan@chromium.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=v8:6031,v8:2137,v8:6076 > > Review-Url: https://codereview.chromium.org/2811103002 > Cr-Commit-Position: refs/heads/master@{#44565} > Committed:13ad508110
TBR=ulan@chromium.org,jshin@chromium.org,jgruber@chromium.org,machenbach@chromium.org BUG=v8:6031,v8:2137,v8:6076 Review-Url: https://codereview.chromium.org/2813863002 Cr-Commit-Position: refs/heads/master@{#44575}
133 lines
4.6 KiB
Python
133 lines
4.6 KiB
Python
# Copyright 2012 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.
|
|
|
|
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
from threading import Timer
|
|
|
|
from ..local import utils
|
|
from ..objects import output
|
|
|
|
|
|
SEM_INVALID_VALUE = -1
|
|
SEM_NOGPFAULTERRORBOX = 0x0002 # Microsoft Platform SDK WinBase.h
|
|
|
|
|
|
def Win32SetErrorMode(mode):
|
|
prev_error_mode = SEM_INVALID_VALUE
|
|
try:
|
|
import ctypes
|
|
prev_error_mode = \
|
|
ctypes.windll.kernel32.SetErrorMode(mode) #@UndefinedVariable
|
|
except ImportError:
|
|
pass
|
|
return prev_error_mode
|
|
|
|
|
|
def RunProcess(verbose, timeout, args, additional_env, **rest):
|
|
if verbose: print "#", " ".join(args)
|
|
popen_args = args
|
|
prev_error_mode = SEM_INVALID_VALUE
|
|
if utils.IsWindows():
|
|
popen_args = subprocess.list2cmdline(args)
|
|
# Try to change the error mode to avoid dialogs on fatal errors. Don't
|
|
# touch any existing error mode flags by merging the existing error mode.
|
|
# See http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx.
|
|
error_mode = SEM_NOGPFAULTERRORBOX
|
|
prev_error_mode = Win32SetErrorMode(error_mode)
|
|
Win32SetErrorMode(error_mode | prev_error_mode)
|
|
|
|
env = os.environ.copy()
|
|
env.update(additional_env)
|
|
# GTest shard information is read by the V8 tests runner. Make sure it
|
|
# doesn't leak into the execution of gtests we're wrapping. Those might
|
|
# otherwise apply a second level of sharding and as a result skip tests.
|
|
env.pop('GTEST_TOTAL_SHARDS', None)
|
|
env.pop('GTEST_SHARD_INDEX', None)
|
|
|
|
try:
|
|
process = subprocess.Popen(
|
|
args=popen_args,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
env=env,
|
|
**rest
|
|
)
|
|
except Exception as e:
|
|
sys.stderr.write("Error executing: %s\n" % popen_args)
|
|
raise e
|
|
|
|
if (utils.IsWindows() and prev_error_mode != SEM_INVALID_VALUE):
|
|
Win32SetErrorMode(prev_error_mode)
|
|
|
|
def kill_process(process, timeout_result):
|
|
timeout_result[0] = True
|
|
try:
|
|
if utils.IsWindows():
|
|
if verbose:
|
|
print "Attempting to kill process %d" % process.pid
|
|
sys.stdout.flush()
|
|
tk = subprocess.Popen(
|
|
'taskkill /T /F /PID %d' % process.pid,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
)
|
|
stdout, stderr = tk.communicate()
|
|
if verbose:
|
|
print "Taskkill results for %d" % process.pid
|
|
print stdout
|
|
print stderr
|
|
print "Return code: %d" % tk.returncode
|
|
sys.stdout.flush()
|
|
else:
|
|
process.kill()
|
|
except OSError:
|
|
sys.stderr.write('Error: Process %s already ended.\n' % process.pid)
|
|
|
|
# Pseudo object to communicate with timer thread.
|
|
timeout_result = [False]
|
|
|
|
timer = Timer(timeout, kill_process, [process, timeout_result])
|
|
timer.start()
|
|
stdout, stderr = process.communicate()
|
|
timer.cancel()
|
|
|
|
return output.Output(
|
|
process.returncode,
|
|
timeout_result[0],
|
|
stdout.decode('utf-8', 'replace').encode('utf-8'),
|
|
stderr.decode('utf-8', 'replace').encode('utf-8'),
|
|
process.pid,
|
|
)
|
|
|
|
|
|
def Execute(args, verbose=False, timeout=None, env=None):
|
|
args = [ c for c in args if c != "" ]
|
|
return RunProcess(verbose, timeout, args, env or {})
|