diff options
Diffstat (limited to 'deps/v8/test/preparser/testcfg.py')
| -rw-r--r-- | deps/v8/test/preparser/testcfg.py | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/deps/v8/test/preparser/testcfg.py b/deps/v8/test/preparser/testcfg.py index 7e51b8ef58..c55e4a85a8 100644 --- a/deps/v8/test/preparser/testcfg.py +++ b/deps/v8/test/preparser/testcfg.py @@ -27,17 +27,11 @@ import os -import re from testrunner.local import testsuite -from testrunner.local import utils from testrunner.objects import testcase -FLAGS_PATTERN = re.compile(r"//\s+Flags:(.*)") -INVALID_FLAGS = ["--enable-slow-asserts"] - - class PreparserTestSuite(testsuite.TestSuite): def __init__(self, name, root): super(PreparserTestSuite, self).__init__(name, root) @@ -45,22 +39,6 @@ class PreparserTestSuite(testsuite.TestSuite): def shell(self): return "d8" - def _GetExpectations(self): - expects_file = os.path.join(self.root, "preparser.expectation") - expectations_map = {} - if not os.path.exists(expects_file): return expectations_map - rule_regex = re.compile("^([\w\-]+)(?::([\w\-]+))?(?::(\d+),(\d+))?$") - for line in utils.ReadLinesFrom(expects_file): - rule_match = rule_regex.match(line) - if not rule_match: continue - expects = [] - if (rule_match.group(2)): - expects += [rule_match.group(2)] - if (rule_match.group(3)): - expects += [rule_match.group(3), rule_match.group(4)] - expectations_map[rule_match.group(1)] = " ".join(expects) - return expectations_map - def _ParsePythonTestTemplates(self, result, filename): pathname = os.path.join(self.root, filename + ".pyt") def Test(name, source, expectation, extra_flags=[]): @@ -84,20 +62,8 @@ class PreparserTestSuite(testsuite.TestSuite): execfile(pathname, {"Test": Test, "Template": Template}) def ListTests(self, context): - expectations = self._GetExpectations() result = [] - # Find all .js files in this directory. - filenames = [f[:-3] for f in os.listdir(self.root) if f.endswith(".js")] - filenames.sort() - for f in filenames: - throws = expectations.get(f, None) - flags = [f + ".js"] - if throws: - flags += ["--throws"] - test = testcase.TestCase(self, f, flags=flags) - result.append(test) - # Find all .pyt files in this directory. filenames = [f[:-4] for f in os.listdir(self.root) if f.endswith(".pyt")] filenames.sort() @@ -106,25 +72,11 @@ class PreparserTestSuite(testsuite.TestSuite): return result def GetFlagsForTestCase(self, testcase, context): - first = testcase.flags[0] - if first != "-e": - testcase.flags[0] = os.path.join(self.root, first) - source = self.GetSourceForTest(testcase) - result = [] - flags_match = re.findall(FLAGS_PATTERN, source) - for match in flags_match: - result += match.strip().split() - result += context.mode_flags - result = [x for x in result if x not in INVALID_FLAGS] - result.append(os.path.join(self.root, testcase.path + ".js")) - return testcase.flags + result return testcase.flags def GetSourceForTest(self, testcase): - if testcase.flags[0] == "-e": - return testcase.flags[1] - with open(testcase.flags[0]) as f: - return f.read() + assert testcase.flags[0] == "-e" + return testcase.flags[1] def _VariantGeneratorFactory(self): return testsuite.StandardVariantGenerator |