baeb4e324d
Using test generators meant that we had to remove the progress indicator since the total number of tests weren't known before-hand. This CL implements a progress indicator using test number estimations. cctest and unittests progress indicator is accurate, however estimating means the progress will terminate over 100% in big test suites and sometimes under 100%. R=machenbach@chromium.org CC=sergiyb@chromium.org,yangguo@chromium.org Bug: v8:8769 Change-Id: I40ca5b40f9b1223376d33707f0945900ea98cea3 Reviewed-on: https://chromium-review.googlesource.com/c/1460471 Commit-Queue: Tamer Tas <tmrts@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#59538}
127 lines
4.3 KiB
Python
127 lines
4.3 KiB
Python
# Copyright 2011 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
|
|
|
|
from testrunner.local import testsuite
|
|
from testrunner.objects import testcase
|
|
|
|
|
|
class VariantsGenerator(testsuite.VariantsGenerator):
|
|
def _get_variants(self, test):
|
|
return self._standard_variant
|
|
|
|
|
|
class TestLoader(testsuite.TestLoader):
|
|
def _list_test_filenames(self):
|
|
for file in os.listdir(self.suite.root):
|
|
if file.endswith(".pyt"):
|
|
yield file[:-4]
|
|
|
|
|
|
# TODO(tmrts): refactor the python template parsing then use the TestLoader.
|
|
class TestSuite(testsuite.TestSuite):
|
|
def _ParsePythonTestTemplates(self, result, filename):
|
|
pathname = os.path.join(self.root, filename + ".pyt")
|
|
def Test(name, source, expectation):
|
|
source = source.replace("\n", " ")
|
|
path = os.path.join(filename, name)
|
|
if expectation:
|
|
template_flags = ["--throws"]
|
|
else:
|
|
template_flags = []
|
|
test = self._create_test(path, source, template_flags)
|
|
result.append(test)
|
|
def Template(name, source):
|
|
def MkTest(replacement, expectation):
|
|
testname = name
|
|
testsource = source
|
|
for key in replacement.keys():
|
|
testname = testname.replace("$" + key, replacement[key]);
|
|
testsource = testsource.replace("$" + key, replacement[key]);
|
|
Test(testname, testsource, expectation)
|
|
return MkTest
|
|
execfile(pathname, {"Test": Test, "Template": Template})
|
|
|
|
def ListTests(self):
|
|
result = []
|
|
|
|
filenames = self._test_loader._list_test_filenames()
|
|
for f in sorted(filenames):
|
|
self._ParsePythonTestTemplates(result, f)
|
|
|
|
# TODO: remove after converting to use a full TestLoader
|
|
self._test_loader.test_count_estimation = len(result)
|
|
return result
|
|
|
|
def _create_test(self, path, source, template_flags):
|
|
return self._test_loader._create_test(
|
|
path, self, source=source, template_flags=template_flags)
|
|
|
|
def _test_loader_class(self):
|
|
return TestLoader
|
|
|
|
def _test_class(self):
|
|
return TestCase
|
|
|
|
def _variants_gen_class(self):
|
|
return VariantsGenerator
|
|
|
|
|
|
class TestCase(testcase.D8TestCase):
|
|
def __init__(self, suite, path, name, test_config, source, template_flags):
|
|
super(TestCase, self).__init__(suite, path, name, test_config)
|
|
|
|
self._source = source
|
|
self._template_flags = template_flags
|
|
|
|
def _get_cmd_params(self):
|
|
return (
|
|
self._get_files_params() +
|
|
self._get_extra_flags() +
|
|
['-e', self._source] +
|
|
self._template_flags +
|
|
self._get_variant_flags() +
|
|
self._get_statusfile_flags() +
|
|
self._get_mode_flags() +
|
|
self._get_source_flags()
|
|
)
|
|
|
|
def _get_mode_flags(self):
|
|
return []
|
|
|
|
def is_source_available(self):
|
|
return True
|
|
|
|
def get_source(self):
|
|
return self._source
|
|
|
|
|
|
def GetSuite(*args, **kwargs):
|
|
return TestSuite(*args, **kwargs)
|