Merge m-c to inbound on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 11 Apr 2014 12:59:41 -0400
changeset 178123 25f7744ab3b2f6d94d84b9e531b2cb7a8413a175
parent 178122 d0bce5d9c518644db36c7a822eb37958dca80dd9 (current diff)
parent 178039 591d708edaeec8868bf102c7742da92afdb0a861 (diff)
child 178124 bc78bf2286321814e42e7b60d5a1b80cd9e54faf
push id26574
push userryanvm@gmail.com
push dateFri, 11 Apr 2014 20:47:50 +0000
treeherdermozilla-central@71a02d5403f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound on a CLOSED TREE.
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -461,18 +461,17 @@ class MochitestUtilsMixin(object):
       # rid ourselves of 2.6.
       info = {}
       for k, v in mozinfo.info.items():
         if isinstance(k, unicode):
           k = k.encode('ascii')
         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)
 
       for test in tests:
         pathAbs = os.path.abspath(test['path'])
         assert pathAbs.startswith(testRootAbs)
         tp = pathAbs[len(testRootAbs):].replace('\\', '/').strip('/')
 
@@ -1509,21 +1508,16 @@ def main():
   mochitest = Mochitest()
   parser = MochitestOptions()
   options, args = parser.parse_args()
   options = parser.verifyOptions(options, mochitest)
   if options is None:
     # 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):
     options.symbolsPath = mochitest.getFullPath(options.symbolsPath)
 
   sys.exit(mochitest.runTests(options))
 
 if __name__ == "__main__":