Bug 946722 - Fix typo causing b2g mochitest mach command to use wrong manifest, r=ato, DONTBUILD, a=NPOTB
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 05 Dec 2013 10:48:46 -0500
changeset 173638 3a4e27241c73dbb49c3f73f659b8311932e39f2c
parent 173637 5097130acf24e6db5f29e7ffd8b37035568f98e0
child 173639 7c60951f996449110b249792445574ad7e9e74f5
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato, DONTBUILD, NPOTB
bugs946722
milestone28.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
Bug 946722 - Fix typo causing b2g mochitest mach command to use wrong manifest, r=ato, DONTBUILD, a=NPOTB
testing/mochitest/mach_commands.py
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -134,17 +134,17 @@ class MochitestRunner(MozbuildObject):
         options = parser.parse_args([])[0]
 
         if test_path:
             test_root_file = mozpack.path.join(self.mochitest_dir, 'tests', test_path)
             if not os.path.exists(test_root_file):
                 print('Specified test path does not exist: %s' % test_root_file)
                 return 1
             options.testPath = test_path
-        elif conditions.is_b2g_desktop:
+        elif conditions.is_b2g_desktop(self):
             options.testManifest = 'b2g-desktop.json'
         else:
             options.testManifest = 'b2g.json'
 
         for k, v in kwargs.iteritems():
             setattr(options, k, v)
         options.noWindow = no_window
         options.totalChunks = total_chunks