Bug 1162003 - Enable run-by-dir mode on Fx desktop opt builds. r=jmaher

dom/media/tests/mochitest/ipc/mochitest.ini

@@ -6,4 +6,4 @@ support-files =
 skip-if = e10s
 
 [test_ipc.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #bug 910661 # b2g(nested ipc not working) b2g-debug(debug-only failure) b2g-desktop(nested ipc not working)
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || os == 'win' #bug 910661 # b2g(nested ipc not working) b2g-debug(debug-only failure) b2g-desktop(nested ipc not working)(win : Bug 1179826)

dom/media/tests/mochitest/mochitest.ini

@@ -102,7 +102,7 @@ skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video suppo
 [test_peerConnection_closeDuringIce.html]
 [test_peerConnection_errorCallbacks.html]
 [test_peerConnection_iceFailure.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet' # Disabling because of test failures on B2G emulator
+skip-if = toolkit == 'gonk' || buildapp == 'mulet' || os == 'linux' || os == 'mac' || os == 'win' # Disabling because of test failures on B2G emulator (Bug 1180388 for win, mac and linux)
 [test_peerConnection_forwarding_basicAudioVideoCombined.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_peerConnection_noTrickleAnswer.html]

dom/tests/mochitest/pointerlock/mochitest.ini

@@ -21,4 +21,4 @@ support-files =
   iframe_differentDOM.html
 
 [test_pointerlock-api.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || buildapp == 'mulet' || e10s # B2G - window.open focus issues using fullscreen
+skip-if = buildapp == 'b2g' || toolkit == 'android' || buildapp == 'mulet' || e10s || os == 'linux' || os == 'win' # B2G - window.open focus issues using fullscreen. (For Linux & Win) Bug1180351

testing/mochitest/runtests.py

@@ -2081,9 +2081,7 @@ class Mochitest(MochitestUtilsMixin):
         self.killNamedOrphans('xpcshell')
 
         # Until we have all green, this only runs on bc*/dt*/mochitest-chrome
-        # jobs, not webapprt*, jetpack*, or plain
-        if options.browserChrome:
-            options.runByDir = True
+        # jobs, not webapprt*, jetpack*, a11yr (for perf reasons), or plain
 
         testsToRun = self.getTestsToRun(options)
         if not options.runByDir:
@@ -2586,6 +2584,18 @@ def run_test_harness(options):
     logger_options = {
         key: value for key, value in vars(options).iteritems() if key.startswith('log')}
     runner = Mochitest(logger_options)
+
+    options.runByDir = False
+
+    if runner.getTestFlavor(options) == 'browser-chrome':
+        options.runByDir = True
+
+    if runner.getTestFlavor(options) == 'mochitest' and (not mozinfo.info['debug']) and (not mozinfo.info['asan']):
+        options.runByDir = True
+
+    if mozinfo.info.get('buildapp') == 'mulet':
+        options.runByDir = False
+
     result = runner.runTests(options)
 
     # don't dump failures if running from automation as treeherder already displays them

testing/mochitest/runtestsb2g.py

@@ -517,7 +517,7 @@ def run_desktop_mochitests(options):
         raise Exception("must specify --profile when specifying --desktop")
 
     options.browserArgs += ['-marionette']
-
+    options.runByDir = False
     retVal = mochitest.runTests(options, onLaunch=mochitest.startTests)
     mochitest.message_logger.finish()
 

testing/mochitest/runtestsremote.py

@@ -283,6 +283,8 @@ def run_test_harness(options):
     if options is None:
         raise ValueError("Invalid options specified, use --help for a list of valid options")
 
+    options.runByDir = False
+
     dm = options.dm
     auto.setDeviceManager(dm)
     mochitest = MochiRemote(auto, dm, options)