summaryrefslogtreecommitdiff
path: root/deps/v8/test/test262/testcfg.py
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/test/test262/testcfg.py')
-rw-r--r--deps/v8/test/test262/testcfg.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/deps/v8/test/test262/testcfg.py b/deps/v8/test/test262/testcfg.py
index 391b0e8c4f..6319feb13c 100644
--- a/deps/v8/test/test262/testcfg.py
+++ b/deps/v8/test/test262/testcfg.py
@@ -28,6 +28,7 @@
import imp
import os
+import re
import sys
import tarfile
@@ -120,7 +121,7 @@ class Test262TestSuite(testsuite.TestSuite):
dirs.sort()
files.sort()
for filename in files:
- if filename.endswith(".js"):
+ if filename.endswith(".js") and not filename.endswith("_FIXTURE.js"):
fullpath = os.path.join(dirname, filename)
relpath = fullpath[len(self.testroot) + 1 : -3]
testname = relpath.replace(os.path.sep, "/")
@@ -184,10 +185,9 @@ class Test262TestSuite(testsuite.TestSuite):
return f.read()
def _ParseException(self, str):
- for line in str.split("\n")[::-1]:
- if line and not line[0].isspace() and ":" in line:
- return line.split(":")[0]
-
+ # somefile:somelinenumber: someerror[: sometext]
+ match = re.search('^[^: ]*:[0-9]+: ([^ ]+?)($|: )', str, re.MULTILINE)
+ return match.group(1)
def IsFailureOutput(self, testcase):
output = testcase.output