wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kaustabh Datta Choudhury 2015-08-11 08:25:00 -04:00
parent bc2bc17559
commit 4944b7594e
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/tests/mochitest/ipc/mochitest.ini
View File

@ -6,4 +6,4 @@ support-files =
skip-if = e10s skip-if = e10s
[test_ipc.html] [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)

2
dom/media/tests/mochitest/mochitest.ini
View File

@ -102,7 +102,7 @@ skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video suppo
[test_peerConnection_closeDuringIce.html] [test_peerConnection_closeDuringIce.html]
[test_peerConnection_errorCallbacks.html] [test_peerConnection_errorCallbacks.html]
[test_peerConnection_iceFailure.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] [test_peerConnection_forwarding_basicAudioVideoCombined.html]
skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) skip-if = toolkit == 'gonk' || buildapp == 'mulet' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
[test_peerConnection_noTrickleAnswer.html] [test_peerConnection_noTrickleAnswer.html]

2
dom/tests/mochitest/pointerlock/mochitest.ini
View File

@ -21,4 +21,4 @@ support-files =
iframe_differentDOM.html iframe_differentDOM.html
[test_pointerlock-api.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

16
testing/mochitest/runtests.py
View File

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

2
testing/mochitest/runtestsb2g.py
View File

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

2
testing/mochitest/runtestsremote.py
View File

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