Skip to content

Commit 51d86f4

Browse files
refackMylesBorins
authored andcommitted
deps: V8: un-cherry-pick bd019bd
Original commit message: [testrunner] delete ancient junit compatible format support Testrunner has ancient support for JUnit compatible XML output. This CL removes this old feature. R=mstarzinger@chromium.org,jgruber@chromium.org,jkummerow@chromium.org CC=​machenbach@chromium.org Bug: v8:8728 Change-Id: I7e1beb011dbaec3aa1a27398a5c52abdd778eaf0 Reviewed-on: https://chromium-review.googlesource.com/c/1430065 Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Commit-Queue: Tamer Tas <tmrts@chromium.org> Cr-Commit-Position: refs/heads/master@{#59045} Refs: v8/v8@bd019bd Backport-PR-URL: #34356 PR-URL: #32116 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
1 parent f340571 commit 51d86f4

File tree

4 files changed

+96
-1
lines changed

4 files changed

+96
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.0',
39+
'v8_embedder_string': '-node.1',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/tools/testrunner/base_runner.py

+6
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,9 @@ def _add_parser_default_options(self, parser):
346346
help="Path to a file for storing json results.")
347347
parser.add_option('--slow-tests-cutoff', type="int", default=100,
348348
help='Collect N slowest tests')
349+
parser.add_option("--junitout", help="File name of the JUnit output")
350+
parser.add_option("--junittestsuite", default="v8tests",
351+
help="The testsuite name in the JUnit output file")
349352
parser.add_option("--exit-after-n-failures", type="int", default=100,
350353
help="Exit after the first N failures instead of "
351354
"running all tests. Pass 0 to disable this feature.")
@@ -797,6 +800,9 @@ def _get_shard_info(self, options):
797800

798801
def _create_progress_indicators(self, test_count, options):
799802
procs = [PROGRESS_INDICATORS[options.progress]()]
803+
if options.junitout:
804+
procs.append(progress.JUnitTestProgressIndicator(options.junitout,
805+
options.junittestsuite))
800806
if options.json_test_results:
801807
procs.append(progress.JsonTestProgressIndicator(
802808
self.framework_name,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Copyright 2013 the V8 project authors. All rights reserved.
2+
# Redistribution and use in source and binary forms, with or without
3+
# modification, are permitted provided that the following conditions are
4+
# met:
5+
#
6+
# * Redistributions of source code must retain the above copyright
7+
# notice, this list of conditions and the following disclaimer.
8+
# * Redistributions in binary form must reproduce the above
9+
# copyright notice, this list of conditions and the following
10+
# disclaimer in the documentation and/or other materials provided
11+
# with the distribution.
12+
# * Neither the name of Google Inc. nor the names of its
13+
# contributors may be used to endorse or promote products derived
14+
# from this software without specific prior written permission.
15+
#
16+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
17+
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
18+
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
19+
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
20+
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
21+
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22+
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24+
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
28+
29+
import xml.etree.ElementTree as xml
30+
31+
32+
class JUnitTestOutput:
33+
def __init__(self, test_suite_name):
34+
self.root = xml.Element("testsuite")
35+
self.root.attrib["name"] = test_suite_name
36+
37+
def HasRunTest(self, test_name, test_cmd, test_duration, test_failure):
38+
testCaseElement = xml.Element("testcase")
39+
testCaseElement.attrib["name"] = test_name
40+
testCaseElement.attrib["cmd"] = test_cmd
41+
testCaseElement.attrib["time"] = str(round(test_duration, 3))
42+
if len(test_failure):
43+
failureElement = xml.Element("failure")
44+
failureElement.text = test_failure
45+
testCaseElement.append(failureElement)
46+
self.root.append(testCaseElement)
47+
48+
def FinishAndWrite(self, f):
49+
xml.ElementTree(self.root).write(f, "UTF-8")

deps/v8/tools/testrunner/testproc/progress.py

+40
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import util
1616

1717
from . import base
18+
from ..local import junit_output
1819

1920

2021
# Base dir of the build products for Release and Debug.
@@ -317,6 +318,45 @@ def _clear_line(self, last_length):
317318
print(("\r" + (" " * last_length) + "\r"), end='')
318319

319320

321+
class JUnitTestProgressIndicator(ProgressIndicator):
322+
def __init__(self, junitout, junittestsuite):
323+
super(JUnitTestProgressIndicator, self).__init__()
324+
self._requirement = base.DROP_PASS_STDOUT
325+
326+
self.outputter = junit_output.JUnitTestOutput(junittestsuite)
327+
if junitout:
328+
self.outfile = open(junitout, "w")
329+
else:
330+
self.outfile = sys.stdout
331+
332+
def _on_result_for(self, test, result):
333+
# TODO(majeski): Support for dummy/grouped results
334+
fail_text = ""
335+
output = result.output
336+
if result.has_unexpected_output:
337+
stdout = output.stdout.strip()
338+
if len(stdout):
339+
fail_text += "stdout:\n%s\n" % stdout
340+
stderr = output.stderr.strip()
341+
if len(stderr):
342+
fail_text += "stderr:\n%s\n" % stderr
343+
fail_text += "Command: %s" % result.cmd.to_string()
344+
if output.HasCrashed():
345+
fail_text += "exit code: %d\n--- CRASHED ---" % output.exit_code
346+
if output.HasTimedOut():
347+
fail_text += "--- TIMEOUT ---"
348+
self.outputter.HasRunTest(
349+
test_name=str(test),
350+
test_cmd=result.cmd.to_string(relative=True),
351+
test_duration=output.duration,
352+
test_failure=fail_text)
353+
354+
def finished(self):
355+
self.outputter.FinishAndWrite(self.outfile)
356+
if self.outfile != sys.stdout:
357+
self.outfile.close()
358+
359+
320360
class JsonTestProgressIndicator(ProgressIndicator):
321361
def __init__(self, framework_name, arch, mode):
322362
super(JsonTestProgressIndicator, self).__init__()

0 commit comments

Comments
 (0)