summaryrefslogtreecommitdiff
path: root/tools/packaging
diff options
context:
space:
mode:
authorBrian Terlson <btthalion@gmail.com>2014-07-18 11:22:48 -0700
committerBrian Terlson <btthalion@gmail.com>2014-07-18 11:22:48 -0700
commit96c6efe0efd041198ec3ba10e50f5715abcd4bcd (patch)
tree54c238ddc5ba951847de0fdda8d15b4aa8eb6aa1 /tools/packaging
parent821e06e3f10cb068c010989eaacfea22c343a351 (diff)
parent7e07cc138d043ffdd0e6730d51d83914dfe6958f (diff)
downloadqtdeclarative-testsuites-96c6efe0efd041198ec3ba10e50f5715abcd4bcd.tar.gz
Merge pull request #43 from smikes/initial-Promise-tests
Initial promise tests
Diffstat (limited to 'tools/packaging')
-rwxr-xr-xtools/packaging/test262.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/packaging/test262.py b/tools/packaging/test262.py
index 5afab6d0a..161dce581 100755
--- a/tools/packaging/test262.py
+++ b/tools/packaging/test262.py
@@ -250,6 +250,12 @@ class TestCase(object):
def IsAsyncTest(self):
return '$DONE' in self.test
+ def GetIncludeList(self):
+ return re.findall('\$INCLUDE\([\'"]([^\)]+)[\'"]\)' ,self.test)
+
+ def GetAdditionalIncludes(self):
+ return '\n'.join([self.suite.GetInclude(include) for include in self.GetIncludeList()])
+
def GetSource(self):
# "var testDescrip = " + str(self.testRecord) + ';\n\n' + \
source = self.suite.GetInclude("cth.js") + \
@@ -259,6 +265,7 @@ class TestCase(object):
self.suite.GetInclude("testIntl.js") + \
self.suite.GetInclude("timer.js") + \
self.suite.GetInclude("doneprintHandle.js").replace('print', self.suite.print_handle) + \
+ self.GetAdditionalIncludes() + \
self.test + '\n'
if self.strict_mode: