Upgrade V8 to 5.1.281.57 DO NOT MERGE
FPIIM-449
Change-Id: Id981b686b4d587ac31697662eb98bb34be42ad90
(cherry picked from commit 3b9bc31999c9787eb726ecdbfd5796bfdec32a18)
diff --git a/tools/testrunner/local/commands.py b/tools/testrunner/local/commands.py
index a4df32c..e725d11 100644
--- a/tools/testrunner/local/commands.py
+++ b/tools/testrunner/local/commands.py
@@ -107,14 +107,16 @@
timer.start()
stdout, stderr = process.communicate()
timer.cancel()
- return process.returncode, timeout_result[0], stdout, stderr
+
+ return output.Output(
+ process.returncode,
+ timeout_result[0],
+ stdout,
+ stderr,
+ process.pid,
+ )
def Execute(args, verbose=False, timeout=None):
args = [ c for c in args if c != "" ]
- exit_code, timed_out, stdout, stderr = RunProcess(
- verbose,
- timeout,
- args=args,
- )
- return output.Output(exit_code, timed_out, stdout, stderr)
+ return RunProcess(verbose, timeout, args=args)
diff --git a/tools/testrunner/local/execution.py b/tools/testrunner/local/execution.py
index 0d90ab8..e0aec0b 100644
--- a/tools/testrunner/local/execution.py
+++ b/tools/testrunner/local/execution.py
@@ -49,9 +49,8 @@
class Instructions(object):
- def __init__(self, command, dep_command, test_id, timeout, verbose):
+ def __init__(self, command, test_id, timeout, verbose):
self.command = command
- self.dep_command = dep_command
self.id = test_id
self.timeout = timeout
self.verbose = verbose
@@ -112,12 +111,7 @@
# the like.
if statusfile.IsSlow(test.outcomes or [statusfile.PASS]):
timeout *= 2
- if test.dependency is not None:
- dep_command = [ c.replace(test.path, test.dependency) for c in command ]
- else:
- dep_command = None
- return Instructions(
- command, dep_command, test.id, timeout, context.verbose)
+ return Instructions(command, test.id, timeout, context.verbose)
class Job(object):
@@ -143,13 +137,33 @@
# Extra debuging information when files are claimed missing.
f = match.group(1)
stderr += ">>> File %s exists? -> %s\n" % (f, os.path.exists(f))
- return test.id, output.Output(1, False, "", stderr), 0
+ return test.id, output.Output(1, False, "", stderr, None), 0
class TestJob(Job):
def __init__(self, test):
self.test = test
+ def _rename_coverage_data(self, output, context):
+ """Rename coverage data.
+
+ Rename files with PIDs to files with unique test IDs, because the number
+ of tests might be higher than pid_max. E.g.:
+ d8.1234.sancov -> d8.test.1.sancov, where 1234 was the process' PID
+ and 1 is the test ID.
+ """
+ if context.sancov_dir and output.pid is not None:
+ sancov_file = os.path.join(
+ context.sancov_dir, "%s.%d.sancov" % (self.test.shell(), output.pid))
+
+ # Some tests are expected to fail and don't produce coverage data.
+ if os.path.exists(sancov_file):
+ parts = sancov_file.split(".")
+ new_sancov_file = ".".join(
+ parts[:-2] + ["test", str(self.test.id)] + parts[-1:])
+ assert not os.path.exists(new_sancov_file)
+ os.rename(sancov_file, new_sancov_file)
+
def Run(self, process_context):
try:
# Retrieve a new suite object on the worker-process side. The original
@@ -160,16 +174,8 @@
return SetupProblem(e, self.test)
start_time = time.time()
- if instr.dep_command is not None:
- dep_output = commands.Execute(
- instr.dep_command, instr.verbose, instr.timeout)
- # TODO(jkummerow): We approximate the test suite specific function
- # IsFailureOutput() by just checking the exit code here. Currently
- # only cctests define dependencies, for which this simplification is
- # correct.
- if dep_output.exit_code != 0:
- return (instr.id, dep_output, time.time() - start_time)
output = commands.Execute(instr.command, instr.verbose, instr.timeout)
+ self._rename_coverage_data(output, process_context.context)
return (instr.id, output, time.time() - start_time)
diff --git a/tools/testrunner/local/statusfile.py b/tools/testrunner/local/statusfile.py
index f86106b..7e96cc3 100644
--- a/tools/testrunner/local/statusfile.py
+++ b/tools/testrunner/local/statusfile.py
@@ -35,7 +35,6 @@
TIMEOUT = "TIMEOUT"
CRASH = "CRASH"
SLOW = "SLOW"
-FLAKY = "FLAKY"
FAST_VARIANTS = "FAST_VARIANTS"
NO_VARIANTS = "NO_VARIANTS"
# These are just for the status files and are mapped below in DEFS:
@@ -46,7 +45,7 @@
ALWAYS = "ALWAYS"
KEYWORDS = {}
-for key in [SKIP, FAIL, PASS, OKAY, TIMEOUT, CRASH, SLOW, FLAKY, FAIL_OK,
+for key in [SKIP, FAIL, PASS, OKAY, TIMEOUT, CRASH, SLOW, FAIL_OK,
FAST_VARIANTS, NO_VARIANTS, PASS_OR_FAIL, FAIL_SLOPPY, ALWAYS]:
KEYWORDS[key] = key
@@ -59,7 +58,7 @@
"android_arm", "android_arm64", "android_ia32", "android_x87",
"android_x64", "arm", "arm64", "ia32", "mips", "mipsel", "mips64",
"mips64el", "x64", "x87", "nacl_ia32", "nacl_x64", "ppc", "ppc64",
- "macos", "windows", "linux", "aix"]:
+ "s390", "s390x", "macos", "windows", "linux", "aix"]:
VARIABLES[var] = var
@@ -79,10 +78,6 @@
return FAST_VARIANTS in outcomes
-def IsFlaky(outcomes):
- return FLAKY in outcomes
-
-
def IsPassOrFail(outcomes):
return ((PASS in outcomes) and (FAIL in outcomes) and
(not CRASH in outcomes) and (not OKAY in outcomes))
diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py
index 55e0eb2..f43d008 100644
--- a/tools/testrunner/local/testsuite.py
+++ b/tools/testrunner/local/testsuite.py
@@ -102,7 +102,6 @@
def __init__(self, name, root):
# Note: This might be called concurrently from different processes.
- # Changing harddisk state should be done in 'SetupWorkingDirectory' below.
self.name = name # string
self.root = root # string containing path
self.tests = None # list of TestCase objects
@@ -110,11 +109,6 @@
self.wildcards = None # dictionary mapping test paths to list of outcomes
self.total_duration = None # float, assigned on demand
- def SetupWorkingDirectory(self):
- # This is called once per test suite object in a multi-process setting.
- # Multi-process-unsafe work-directory setup can go here.
- pass
-
def shell(self):
return "d8"
@@ -159,10 +153,6 @@
self.tests = self.ListTests(context)
@staticmethod
- def _FilterFlaky(flaky, mode):
- return (mode == "run" and not flaky) or (mode == "skip" and flaky)
-
- @staticmethod
def _FilterSlow(slow, mode):
return (mode == "run" and not slow) or (mode == "skip" and slow)
@@ -171,13 +161,11 @@
return (mode == "run" and not pass_fail) or (mode == "skip" and pass_fail)
def FilterTestCasesByStatus(self, warn_unused_rules,
- flaky_tests="dontcare",
slow_tests="dontcare",
pass_fail_tests="dontcare"):
filtered = []
used_rules = set()
for t in self.tests:
- flaky = False
slow = False
pass_fail = False
testname = self.CommonTestName(t)
@@ -191,7 +179,6 @@
for outcome in t.outcomes:
if outcome.startswith('Flags: '):
t.flags += outcome[7:].split()
- flaky = statusfile.IsFlaky(t.outcomes)
slow = statusfile.IsSlow(t.outcomes)
pass_fail = statusfile.IsPassOrFail(t.outcomes)
skip = False
@@ -203,10 +190,9 @@
if statusfile.DoSkip(t.outcomes):
skip = True
break # "for rule in self.wildcards"
- flaky = flaky or statusfile.IsFlaky(t.outcomes)
slow = slow or statusfile.IsSlow(t.outcomes)
pass_fail = pass_fail or statusfile.IsPassOrFail(t.outcomes)
- if (skip or self._FilterFlaky(flaky, flaky_tests)
+ if (skip
or self._FilterSlow(slow, slow_tests)
or self._FilterPassFail(pass_fail, pass_fail_tests)):
continue # "for t in self.tests"
@@ -262,14 +248,14 @@
def GetSourceForTest(self, testcase):
return "(no source available)"
- def IsFailureOutput(self, output, testpath):
- return output.exit_code != 0
+ def IsFailureOutput(self, testcase):
+ return testcase.output.exit_code != 0
def IsNegativeTest(self, testcase):
return False
def HasFailed(self, testcase):
- execution_failed = self.IsFailureOutput(testcase.output, testcase.path)
+ execution_failed = self.IsFailureOutput(testcase)
if self.IsNegativeTest(testcase):
return not execution_failed
else:
@@ -328,9 +314,9 @@
if test_desc.endswith('.'):
test_case = test_desc
elif test_case and test_desc:
- test = testcase.TestCase(self, test_case + test_desc, dependency=None)
+ test = testcase.TestCase(self, test_case + test_desc)
tests.append(test)
- tests.sort()
+ tests.sort(key=lambda t: t.path)
return tests
def GetFlagsForTestCase(self, testcase, context):
diff --git a/tools/testrunner/local/utils.py b/tools/testrunner/local/utils.py
index cb6c350..c880dfc 100644
--- a/tools/testrunner/local/utils.py
+++ b/tools/testrunner/local/utils.py
@@ -102,6 +102,8 @@
return 'ia32'
elif machine == 'amd64':
return 'ia32'
+ elif machine == 's390x':
+ return 's390'
elif machine == 'ppc64':
return 'ppc'
else: