Bug 855562 - Fix error in "mach mochitest-metro" [r=Ms2ger]

This commit is contained in:
Matt Brubeck 2013-03-28 09:23:03 -07:00
parent d699331eb7
commit 14223aebc4

View File

@ -91,6 +91,22 @@ class MochitestRunner(MozbuildObject):
opts = mochitest.MochitestOptions(automation, tests_dir)
options, args = opts.parse_args([])
# Need to set the suite options before verifyOptions below.
if suite == 'plain':
# Don't need additional options for plain.
pass
elif suite == 'chrome':
options.chrome = True
elif suite == 'browser':
options.browserChrome = True
elif suite == 'metro':
options.immersiveMode = True
options.browserChrome = True
elif suite == 'a11y':
options.a11y = True
else:
raise Exception('None or unrecognized mochitest suite type.')
options = opts.verifyOptions(options, runner)
if options is None:
@ -111,21 +127,6 @@ class MochitestRunner(MozbuildObject):
automation.setServerInfo(options.webServer, options.httpPort,
options.sslPort, options.webSocketPort)
if suite == 'plain':
# Don't need additional options for plain.
pass
elif suite == 'chrome':
options.chrome = True
elif suite == 'browser':
options.browserChrome = True
elif suite == 'metro':
options.immersiveMode = True
options.browser = True
elif suite == 'a11y':
options.a11y = True
else:
raise Exception('None or unrecognized mochitest suite type.')
if test_path:
test_root = runner.getTestRoot(options)
test_root_file = mozpack.path.join(mochitest_dir, test_root, test_path)