Bug 1162226 - Fix mach mochitest regression on b2g desktop builds, r=chmanchester
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 06 May 2015 16:44:01 -0400
changeset 242768 2a68efa2d877244e2b5ac5ffe926e355bafec162
parent 242767 d55f825951b42409710cf2350e55623c6bcd0c86
child 242769 587ad4afaeb9cf29287707ef5a0fe5ae45d07d4b
push id59498
push userahalberstadt@mozilla.com
push dateThu, 07 May 2015 15:26:48 +0000
treeherdermozilla-inbound@2a68efa2d877 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1162226
milestone40.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 1162226 - Fix mach mochitest regression on b2g desktop builds, r=chmanchester
testing/mochitest/mochitest_options.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -1154,17 +1154,17 @@ class MochitestArgumentParser(ArgumentPa
     def __init__(self, app=None, **kwargs):
         ArgumentParser.__init__(self, usage=self.__doc__, conflict_handler='resolve', **kwargs)
 
         self.oldcwd = os.getcwd()
         self.app = app
         if not self.app and build_obj:
             if conditions.is_android(build_obj):
                 self.app = 'android'
-            elif conditions.is_b2g(build_obj):
+            elif conditions.is_b2g(build_obj) or conditions.is_b2g_desktop(build_obj):
                 self.app = 'b2g'
         if not self.app:
             # platform can't be determined and app wasn't specified explicitly,
             # so just use generic arguments and hope for the best
             self.app = 'generic'
 
         if self.app not in container_map:
             self.error("Unrecognized app '{}'! Must be one of: {}".format(