Index: test/preparser/testcfg.py |
diff --git a/test/preparser/testcfg.py b/test/preparser/testcfg.py |
index 7e51b8ef58bfe5a7bc0edcd5f2d4e34a04882f0a..2070c8cee2b2e0967fbec0f3b3235a555629b319 100644 |
--- a/test/preparser/testcfg.py |
+++ b/test/preparser/testcfg.py |
@@ -45,22 +45,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,17 +68,13 @@ 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) |