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. [email protected],[email protected],[email protected] CC=​[email protected] Bug: v8:8728 Change-Id: I7e1beb011dbaec3aa1a27398a5c52abdd778eaf0 Reviewed-on: https://chromium-review.googlesource.com/c/1430065 Reviewed-by: Jakob Gruber <[email protected]> Reviewed-by: Michael Starzinger <[email protected]> Commit-Queue: Tamer Tas <[email protected]> Cr-Commit-Position: refs/heads/master@{#59045} Refs: v8/v8@bd019bd PR-URL: #32116 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>

Author: refack

common.gypi

@@ -36,7 +36,7 @@
 
 # Reset this number to 0 on major V8 upgrades.
 # Increment by one for each non-official patch applied to deps/v8.
-'v8_embedder_string': '-node.0',
+'v8_embedder_string': '-node.1',
 
 ##### V8 defaults for Node.js #####
 

deps/v8/tools/testrunner/base_runner.py

@@ -358,6 +358,9 @@ def _add_parser_default_options(self, parser):
 help="Path to a file for storing json results.")
 parser.add_option('--slow-tests-cutoff', type="int", default=100,
 help='Collect N slowest tests')
+parser.add_option("--junitout", help="File name of the JUnit output")
+parser.add_option("--junittestsuite", default="v8tests",
+help="The testsuite name in the JUnit output file")
 parser.add_option("--exit-after-n-failures", type="int", default=100,
 help="Exit after the first N failures instead of "
 "running all tests. Pass 0 to disable this feature.")
@@ -780,6 +783,9 @@ def _get_shard_info(self, options):
 
 def_create_progress_indicators(self, test_count, options):
 procs= [PROGRESS_INDICATORS[options.progress]()]
+ifoptions.junitout:
+procs.append(progress.JUnitTestProgressIndicator(options.junitout,
+options.junittestsuite))
 ifoptions.json_test_results:
 procs.append(progress.JsonTestProgressIndicator(self.framework_name))
 

deps/v8/tools/testrunner/local/junit_output.py

@@ -0,0 +1,49 @@
+# 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.
+
+
+importxml.etree.ElementTreeasxml
+
+
+classJUnitTestOutput:
+def__init__(self, test_suite_name):
+self.root=xml.Element("testsuite")
+self.root.attrib["name"] =test_suite_name
+
+defHasRunTest(self, test_name, test_cmd, test_duration, test_failure):
+testCaseElement=xml.Element("testcase")
+testCaseElement.attrib["name"] =test_name
+testCaseElement.attrib["cmd"] =test_cmd
+testCaseElement.attrib["time"] =str(round(test_duration, 3))
+iflen(test_failure):
+failureElement=xml.Element("failure")
+failureElement.text=test_failure
+testCaseElement.append(failureElement)
+self.root.append(testCaseElement)
+
+defFinishAndWrite(self, f):
+xml.ElementTree(self.root).write(f, "UTF-8")

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

@@ -15,6 +15,7 @@
 
 from . importbase
 from . importutil
+from ..localimportjunit_output
 
 
 defprint_failure_header(test):
@@ -348,6 +349,45 @@ def _clear_line(self, last_length):
 print(("\r"+ (" "*last_length) +"\r"), end='')
 
 
+classJUnitTestProgressIndicator(ProgressIndicator):
+def__init__(self, junitout, junittestsuite):
+super(JUnitTestProgressIndicator, self).__init__()
+self._requirement=base.DROP_PASS_STDOUT
+
+self.outputter=junit_output.JUnitTestOutput(junittestsuite)
+ifjunitout:
+self.outfile=open(junitout, "w")
+else:
+self.outfile=sys.stdout
+
+def_on_result_for(self, test, result):
+# TODO(majeski): Support for dummy/grouped results
+fail_text=""
+output=result.output
+ifresult.has_unexpected_output:
+stdout=output.stdout.strip()
+iflen(stdout):
+fail_text+="stdout:\n%s\n"%stdout
+stderr=output.stderr.strip()
+iflen(stderr):
+fail_text+="stderr:\n%s\n"%stderr
+fail_text+="Command: %s"%result.cmd.to_string()
+ifoutput.HasCrashed():
+fail_text+="exit code: %d\n--- CRASHED ---"%output.exit_code
+ifoutput.HasTimedOut():
+fail_text+="--- TIMEOUT ---"
+self.outputter.HasRunTest(
+test_name=str(test),
+test_cmd=result.cmd.to_string(relative=True),
+test_duration=output.duration,
+test_failure=fail_text)
+
+deffinished(self):
+self.outputter.FinishAndWrite(self.outfile)
+ifself.outfile!=sys.stdout:
+self.outfile.close()
+
+
 classJsonTestProgressIndicator(ProgressIndicator):
 def__init__(self, framework_name):
 super(JsonTestProgressIndicator, self).__init__()