Bug 1301981 - Add devtools test task definition to linux64-jsdcov. r?chmanchester
This patch provides the implementation that makes it possible to run the devtools test suite with the linux64-jsdcov build to collect js code coverage.
MozReview-Commit-ID: KFmFhKsDq5s
--- a/taskcluster/ci/desktop-test/test-sets.yml
+++ b/taskcluster/ci/desktop-test/test-sets.yml
@@ -90,9 +90,10 @@ windows-vm-tests:
ccov-code-coverage-tests:
- mochitest
- mochitest-browser-chrome
- mochitest-devtools-chrome
- xpcshell
jsdcov-code-coverage-tests:
- - mochitest-browser-chrome
\ No newline at end of file
+ - mochitest-browser-chrome
+ - mochitest-devtools-chrome
\ No newline at end of file
--- a/taskcluster/ci/desktop-test/tests.yml
+++ b/taskcluster/ci/desktop-test/tests.yml
@@ -325,49 +325,56 @@ mochitest-clipboard:
default:
- unittests/linux_unittest.py
- remove_executables.py
extra-options:
- --mochitest-suite=plain-clipboard,chrome-clipboard,browser-chrome-clipboard,jetpack-package-clipboard
mochitest-devtools-chrome:
description: "Mochitest devtools-chrome run"
- suite: mochitest/mochitest-devtools-chrome-chunked
+ suite:
+ by-test-platform:
+ linux64-jsdcov/opt: mochitest/mochitest-devtools-chrome-coverage
+ default: mochitest/mochitest-devtools-chrome-chunked
treeherder-symbol: tc-M(dt)
loopback-video: true
max-run-time: 5400
chunks:
by-test-platform:
win.*: 8
default: 10
run-on-projects:
by-test-platform:
linux64-ccov/opt: []
+ linux64-jsdcov/opt: []
default: ['all']
e10s:
by-test-platform:
# Bug 1242986: linux64/debug mochitest-devtools-chrome e10s is not greened up yet
linux64/debug: false
linux64-ccov/opt: false
+ linux64-jsdcov/opt: false
default: both
mozharness:
script: desktop_unittest.py
no-read-buildbot-config: true
config:
by-test-platform:
win.*:
- unittests/win_taskcluster_unittest.py
default:
- unittests/linux_unittest.py
- remove_executables.py
extra-options:
by-test-platform:
linux64-ccov/opt:
- --mochitest-suite=mochitest-devtools-chrome-chunked
- --code-coverage
+ linux64-jsdcov:
+ - --mochitest-suite=mochitest-devtools-chrome-coverage
default:
- --mochitest-suite=mochitest-devtools-chrome-chunked
instance-size:
by-test-platform:
# Bug 1281241: migrating to m3.large instances
linux64-asan/opt: legacy
default: default
# Bug 1296086: high number of intermittents observed with software GL and large instances
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -189,16 +189,17 @@ config = {
"browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
"browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
"browser-chrome-addons": ["--flavor=browser", "--chunk-by-runtime", "--tag=addons"],
"browser-chrome-coverage": ["--flavor=browser", "--chunk-by-runtime", "--timeout=1200"],
"browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
"mochitest-gl": ["--subsuite=webgl"],
"mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"],
"mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
+ "mochitest-devtools-chrome-coverage": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime", "--timeout=1200"],
"jetpack-package": ["--flavor=jetpack-package"],
"jetpack-package-clipboard": ["--flavor=jetpack-package", "--subsuite=clipboard"],
"jetpack-addon": ["--flavor=jetpack-addon"],
"a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {
"reftest": {
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -394,17 +394,17 @@ class DesktopUnittest(TestingMixin, Merc
# set pluginsPath
abs_res_plugins_dir = os.path.join(abs_res_dir, 'plugins')
str_format_values['test_plugin_path'] = abs_res_plugins_dir
if suite_category not in c["suite_definitions"]:
self.fatal("'%s' not defined in the config!")
- if suite in ('browser-chrome-coverage', 'xpcshell-coverage'):
+ if suite in ('browser-chrome-coverage', 'xpcshell-coverage', 'mochitest-devtools-chrome-coverage'):
base_cmd.append('--jscov-dir-prefix=%s' %
dirs['abs_blob_upload_dir'])
options = c["suite_definitions"][suite_category]["options"]
if options:
for option in options:
option = option % str_format_values
if not option.endswith('None'):