Bug 970302 - Ensure a TestManifest is always used when running xpcshell tests; r=ted
authorGregory Szorc <gps@mozilla.com>
Mon, 10 Feb 2014 13:11:23 -0800
changeset 168364 881a08901c0db0ef5fd05bd47ace0d35f0b6ee9b
parent 168363 926feb30decc8fd0ac3306bd11de19ad90f3fc52
child 168365 dc26e8d484f8739c00afbaaf9795563959b6f774
push id5037
push usergszorc@mozilla.com
push dateWed, 12 Feb 2014 19:22:09 +0000
treeherderfx-team@881a08901c0d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs970302
milestone30.0a1
Bug 970302 - Ensure a TestManifest is always used when running xpcshell tests; r=ted
testing/xpcshell/mach_commands.py
--- a/testing/xpcshell/mach_commands.py
+++ b/testing/xpcshell/mach_commands.py
@@ -41,18 +41,19 @@ class TestStartFilter(logging.Filter):
 # runners.
 class InvalidTestPathError(Exception):
     """Exception raised when the test path is not valid."""
 
 
 class XPCShellRunner(MozbuildObject):
     """Run xpcshell tests."""
     def run_suite(self, **kwargs):
-        manifest = os.path.join(self.topobjdir, '_tests', 'xpcshell',
-            'xpcshell.ini')
+        from manifestparser import TestManifest
+        manifest = TestManifest(manifests=[os.path.join(self.topobjdir,
+            '_tests', 'xpcshell', 'xpcshell.ini')])
 
         return self._run_xpcshell_harness(manifest=manifest, **kwargs)
 
     def run_test(self, test_file, interactive=False,
                  keep_going=False, sequential=False, shuffle=False,
                  debugger=None, debuggerArgs=None, debuggerInteractive=None,
                  rerun_failures=False,
                  # ignore parameters from other platforms' options