1685b5d27a
This reverts commit 71605b3ea4.
Reason for revert: Seems to break static-initializers step:
https://build.chromium.org/p/client.v8/builders/V8%20Linux64/builds/22156
Original change's description:
> [test] Move has unexpected output to outproc.
>
> Expected outcomes optimized to serialize [PASS] as None.
>
> Keeping expected outcomes inside output processors should be
> optimized in the future. Few possible optimizations:
> - separate classes for tests that are expected to PASS - done as
> an example in mozilla test suite.
> - cache output processors inside testcase.
> - share output processors between copies of the same test - needs
> some updates to the create_variant to update outproc only if
> expected outcomes changed.
>
> Bug: v8:6917
> Change-Id: Ie73f1dcdf17fdfc65bce27228f818b1dd1e420c9
> Reviewed-on: https://chromium-review.googlesource.com/843025
> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#50347}
TBR=machenbach@chromium.org,sergiyb@chromium.org,majeski@google.com
Change-Id: Ice1f3aee0a26f7f38996459d38fd6e0bd964113d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:6917
Reviewed-on: https://chromium-review.googlesource.com/849572
Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Bill Budge <bbudge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50348}
127 lines
4.6 KiB
Python
127 lines
4.6 KiB
Python
# 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.
|
|
|
|
import os
|
|
import re
|
|
|
|
from testrunner.local import testsuite
|
|
from testrunner.objects import outproc
|
|
from testrunner.objects import testcase
|
|
|
|
FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
|
|
SELF_SCRIPT_PATTERN = re.compile(r"//\s+Env: TEST_FILE_NAME")
|
|
|
|
|
|
# TODO (machenbach): Share commonalities with mjstest.
|
|
class TestSuite(testsuite.TestSuite):
|
|
def ListTests(self, context):
|
|
tests = []
|
|
for dirname, dirs, files in os.walk(self.root):
|
|
for dotted in [x for x in dirs if x.startswith('.')]:
|
|
dirs.remove(dotted)
|
|
if 'resources' in dirs:
|
|
dirs.remove('resources')
|
|
|
|
dirs.sort()
|
|
files.sort()
|
|
for filename in files:
|
|
if filename.endswith(".js"):
|
|
fullpath = os.path.join(dirname, filename)
|
|
relpath = fullpath[len(self.root) + 1 : -3]
|
|
testname = relpath.replace(os.path.sep, "/")
|
|
test = self._create_test(testname)
|
|
tests.append(test)
|
|
return tests
|
|
|
|
def _test_class(self):
|
|
return TestCase
|
|
|
|
|
|
class TestCase(testcase.TestCase):
|
|
def __init__(self, *args, **kwargs):
|
|
super(TestCase, self).__init__(*args, **kwargs)
|
|
|
|
source = self.get_source()
|
|
self._source_files = self._parse_source_files(source)
|
|
self._source_flags = self._parse_source_flags(source)
|
|
self._outproc = OutProc(
|
|
os.path.join(self.suite.root, self.path) + '-expected.txt')
|
|
|
|
def _parse_source_files(self, source):
|
|
files_list = [] # List of file names to append to command arguments.
|
|
files_match = FILES_PATTERN.search(source);
|
|
# Accept several lines of 'Files:'.
|
|
while True:
|
|
if files_match:
|
|
files_list += files_match.group(1).strip().split()
|
|
files_match = FILES_PATTERN.search(source, files_match.end())
|
|
else:
|
|
break
|
|
files = [ os.path.normpath(os.path.join(self.suite.root, '..', '..', f))
|
|
for f in files_list ]
|
|
testfilename = os.path.join(self.suite.root, self.path + self._get_suffix())
|
|
if SELF_SCRIPT_PATTERN.search(source):
|
|
env = ["-e", "TEST_FILE_NAME=\"%s\"" % testfilename.replace("\\", "\\\\")]
|
|
files = env + files
|
|
files.append(os.path.join(self.suite.root, "resources/standalone-pre.js"))
|
|
files.append(testfilename)
|
|
files.append(os.path.join(self.suite.root, "resources/standalone-post.js"))
|
|
return files
|
|
|
|
def _get_files_params(self, ctx):
|
|
files = self._source_files
|
|
if ctx.isolates:
|
|
files = files + ['--isolate'] + files
|
|
return files
|
|
|
|
def _get_source_flags(self):
|
|
return self._source_flags
|
|
|
|
def _get_source_path(self):
|
|
return os.path.join(self.suite.root, self.path + self._get_suffix())
|
|
|
|
@property
|
|
def output_proc(self):
|
|
return self._outproc
|
|
|
|
|
|
class OutProc(outproc.ExpectedOutProc):
|
|
def _is_failure_output(self, output):
|
|
if output.exit_code != 0:
|
|
return True
|
|
return super(OutProc, self)._is_failure_output(output)
|
|
|
|
def _ignore_expected_line(self, line):
|
|
return (
|
|
line.startswith('#') or
|
|
super(OutProc, self)._ignore_expected_line(line)
|
|
)
|
|
|
|
|
|
def GetSuite(name, root):
|
|
return TestSuite(name, root)
|