summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSam Mikes <smikes@cubane.com>2014-10-24 15:18:37 +0100
committerSam Mikes <smikes@cubane.com>2014-10-24 15:18:37 +0100
commit89d71f56b2f1d58a7973f8af79b9545b275b53db (patch)
tree8eeef8e6a0483dcfa99020a531cdae2ce48b78e8 /tools
parente2b675f4432b2e4948adc4b47ff129acbd2d963e (diff)
downloadqtdeclarative-testsuites-89d71f56b2f1d58a7973f8af79b9545b275b53db.tar.gz
additional fixes suggested by @anba
Diffstat (limited to 'tools')
-rwxr-xr-xtools/packaging/test262.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/packaging/test262.py b/tools/packaging/test262.py
index 8e6fd0a10..aa396cbe1 100755
--- a/tools/packaging/test262.py
+++ b/tools/packaging/test262.py
@@ -209,10 +209,15 @@ class TestResult(object):
if self.case.IsAsyncTest():
return self.AsyncHasFailed() or self.HasFailed()
elif self.case.IsNegative():
- return not (self.HasFailed() and self.case.NegativeMatch(self.stderr))
+ return not (self.HasFailed() and self.case.NegativeMatch(self.GetErrorOutput()))
else:
return self.HasFailed()
+ def GetErrorOutput(self):
+ if len(self.stderr) != 0:
+ return self.stderr
+ return self.stdout
+
class TestCase(object):