Merge m-c to inbound on a CLOSED TREE.

This commit is contained in:
Ryan VanderMeulen 2014-04-11 12:59:41 -04:00
commit e9a3f605a3

View File

@ -466,8 +466,7 @@ class MochitestUtilsMixin(object):
info[k] = v
# Bug 883858 - return all tests including disabled tests
# tests = manifest.active_tests(disabled=True, options=options, **info)
tests = manifest.active_tests(disabled=True, **info)
tests = manifest.active_tests(disabled=True, options=options, **info)
paths = []
testPath = self.getTestPath(options)
@ -1514,11 +1513,6 @@ def main():
# parsing error
sys.exit(1)
if options.subsuite:
print "INFO | terminating test run as subsuite is not fully supported yet"
print "INFO TEST-START | Shutdown"
return 0
options.utilityPath = mochitest.getFullPath(options.utilityPath)
options.certPath = mochitest.getFullPath(options.certPath)
if options.symbolsPath and not isURL(options.symbolsPath):