Bug 1496791 - Disable linux64-jsdcov completely. r=jmaher
authorGregory Mierzwinski <gmierz2@outlook.com>
Fri, 05 Oct 2018 21:06:25 +0000
changeset 495586 2d5a9a9d3baa744707c58eec07f9c20e65869d30
parent 495585 48715242d46a18214ccbe4692b4d77b5110268a2
child 495587 4a0b6cfb51a1bd90eed7475b0ee06b0e1092fe10
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1496791
milestone64.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 1496791 - Disable linux64-jsdcov completely. r=jmaher This patch removes linux64-jsdcov from the available builds on taskcluster along with any hacks used to run it. It also removes any 'coverage' entries that were added to skip tests. Differential Revision: https://phabricator.services.mozilla.com/D7919
browser/base/content/test/general/browser.ini
devtools/client/aboutdebugging/test/browser.ini
dom/indexedDB/test/unit/xpcshell-parent-process.ini
js/src/jit-test/jit_test.py
security/manager/ssl/tests/unit/xpcshell-smartcards.ini
taskcluster/ci/build/linux.yml
taskcluster/ci/test/misc.yml
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/test-sets.yml
taskcluster/ci/test/web-platform.yml
taskcluster/ci/test/xpcshell.yml
taskcluster/taskgraph/transforms/job/mozharness_test.py
taskcluster/taskgraph/transforms/tests.py
taskcluster/taskgraph/try_option_syntax.py
testing/mochitest/runtests.py
testing/mozharness/mozharness/mozilla/testing/codecoverage.py
testing/xpcshell/runxpcshelltests.py
toolkit/components/osfile/tests/xpcshell/xpcshell.ini
toolkit/components/startup/tests/unit/xpcshell.ini
toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
tools/profiler/tests/xpcshell.ini
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -131,17 +131,16 @@ skip-if = toolkit == "cocoa"
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug481560.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug484315.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug491431.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug495058.js]
-skip-if = coverage # Bug 1439493
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug519216.js]
 skip-if = true # Bug 1478159
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug520538.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug521216.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
--- a/devtools/client/aboutdebugging/test/browser.ini
+++ b/devtools/client/aboutdebugging/test/browser.ini
@@ -18,26 +18,25 @@ support-files =
   service-workers/fetch-sw.html
   service-workers/fetch-sw.js
   service-workers/push-sw.html
   service-workers/push-sw.js
   !/devtools/client/shared/test/shared-head.js
   !/devtools/client/shared/test/telemetry-test-helpers.js
 
 [browser_addons_debug_bootstrapped.js]
-skip-if = coverage # Bug 1387827
 [browser_addons_debug_info.js]
 [browser_addons_debug_webextension.js]
 tags = webextensions
 [browser_addons_debug_webextension_inspector.js]
 tags = webextensions
 [browser_addons_debug_webextension_nobg.js]
 tags = webextensions
 [browser_addons_debug_webextension_popup.js]
-skip-if = coverage || (verify && debug) || (debug && os == "linux" && bits == 64) # coverage: Bug 1387827, verify: crashes on shutdown, timeouts linux debug Bug 1299001
+skip-if = (verify && debug) || (debug && os == "linux" && bits == 64) # verify: crashes on shutdown, timeouts linux debug Bug 1299001
 tags = webextensions
 [browser_addons_debugging_initial_state.js]
 [browser_addons_install.js]
 skip-if = verify && debug
 [browser_addons_reload.js]
 [browser_addons_remove.js]
 [browser_addons_toggle_debug.js]
 [browser_page_not_found.js]
--- a/dom/indexedDB/test/unit/xpcshell-parent-process.ini
+++ b/dom/indexedDB/test/unit/xpcshell-parent-process.ini
@@ -61,9 +61,8 @@ skip-if = true
 [test_storageOption_pref.js]
 skip-if = os == "android"
 [test_storagePersistentUpgrade.js]
 [test_temporary_storage.js]
 # bug 951017: intermittent failure on Android x86 emulator
 skip-if = os == "android" && processor == "x86"
 [test_wasm_put_get_values.js]
 [test_wasm_recompile.js]
-skip-if = coverage # bug 1336727
--- a/js/src/jit-test/jit_test.py
+++ b/js/src/jit-test/jit_test.py
@@ -246,17 +246,17 @@ def main(argv):
                 traceback.print_exc()
                 sys.stderr.write('---\n')
 
     if read_all:
         test_list = jittests.find_tests()
 
     # Exclude tests when code coverage is enabled.
     # This part is equivalent to:
-    # skip-if = coverage
+    # skip-if = ccov
     if os.getenv('GCOV_PREFIX') is not None:
         # JSVM errors.
         options.exclude += [os.path.join('basic', 'functionnames.js')]           # Bug 1369783
         options.exclude += [os.path.join('debug', 'Debugger-findScripts-23.js')]
         options.exclude += [os.path.join('debug', 'bug1160182.js')]
         options.exclude += [os.path.join('xdr', 'incremental-encoder.js')]
         options.exclude += [os.path.join('xdr', 'bug1186973.js')]                # Bug 1369785
         options.exclude += [os.path.join('xdr', 'relazify.js')]
--- a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
+++ b/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
@@ -3,12 +3,11 @@ head = head_psm.js
 tail =
 tags = psm
 skip-if = toolkit == 'android'
 support-files =
 
 [test_pkcs11_module.js]
 [test_pkcs11_moduleDB.js]
 [test_pkcs11_safe_mode.js]
-skip-if = coverage # bug 1336728
 [test_pkcs11_slot.js]
 [test_pkcs11_token.js]
 [test_pkcs11_tokenDB.js]
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -955,47 +955,16 @@ linux64-tup/opt:
         - linux64-binutils
         - linux64-clang
         - linux64-rust-nightly
         - linux64-cbindgen
         - linux64-sccache
         - linux64-tup
         - linux64-node
 
-linux64-jsdcov/opt:
-    description: "Linux64-JSDCov Opt"
-    index:
-        product: firefox
-        job-name: linux64-jsdcov-opt
-    treeherder:
-        platform: linux64-jsdcov/opt
-        symbol: B
-        tier: 2
-    run-on-projects: ['mozilla-central', 'try']
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-    worker:
-        max-run-time: 7200
-    run:
-        using: mozharness
-        actions: [get-secrets build check-test]
-        config:
-            - builds/releng_base_firefox.py
-            - builds/releng_base_linux_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        tooltool-downloads: public
-        need-xvfb: true
-    toolchains:
-        - linux64-binutils
-        - linux64-clang
-        - linux64-rust
-        - linux64-cbindgen
-        - linux64-sccache
-        - linux64-node
-
 linux64-ccov/debug:
     description: "Linux64-CCov Debug"
     index:
         product: firefox
         job-name: linux64-ccov-debug
     treeherder:
         platform: linux64-ccov/debug
         symbol: B
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -104,19 +104,18 @@ test-verify:
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default
     max-run-time: 10800
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
-            # do not run on ccov or jsdcov
+            # do not run on ccov
             .*-ccov/.*: []
-            .*-jsdcov/.*: []
             .*-asan/.*: []
             # do not run on beta or release: usually just confirms earlier results
             .*-msvc/.*: ['mozilla-central', 'try']
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         script:
             by-test-platform:
@@ -149,19 +148,18 @@ test-verify-gpu:
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default
     max-run-time: 10800
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
-            # do not run on ccov or jsdcov
+            # do not run on ccov
             .*-ccov/.*: []
-            .*-jsdcov/.*: []
             .*-asan/.*: []
             # do not run on beta or release: usually just confirms earlier results
             .*-msvc/.*: ['mozilla-central', 'try']
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         script:
             by-test-platform:
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -36,33 +36,29 @@ job-defaults:
                     - remove_executables.py
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
 
 mochitest:
     description: "Mochitest plain run"
-    suite:
-        by-test-platform:
-            linux64-jsdcov/opt: mochitest/plain-chunked-coverage
-            default: mochitest/plain-chunked
+    suite: mochitest/plain-chunked
     treeherder-symbol: M()
     loopback-video: true
     run-on-projects:
         by-test-platform:
             windows10-64-qr/debug: []  # bug 1424755
             default: built-projects
     tier:
         by-test-platform:
             windows10-64-qr/debug: 3  # this should be disabled but might run via try syntax anyway, so explicitly downgrade to tier-3
             default: default
     instance-size:
         by-test-platform:
-            linux64-jsdcov/opt: xlarge
             android-em.*: xlarge
             default: default
     virtualization:
         by-test-platform:
             windows10-64-qr/.*: virtual-with-gpu
             default: virtual
     chunks:
         by-test-platform:
@@ -103,20 +99,17 @@ mochitest-a11y:
     loopback-video: true
     e10s: false
     run-on-projects: built-projects
     mozharness:
         mochitest-flavor: a11y
 
 mochitest-browser-chrome:
     description: "Mochitest browser-chrome run"
-    suite:
-        by-test-platform:
-            linux64-jsdcov/opt: mochitest/browser-chrome-coverage
-            default: mochitest/browser-chrome-chunked
+    suite: mochitest/browser-chrome-chunked
     treeherder-symbol: M(bc)
     loopback-video: true
     chunks:
         by-test-platform:
             linux.*/debug: 16
             linux64-asan/opt: 16
             default: 7
     max-run-time:
@@ -125,20 +118,17 @@ mochitest-browser-chrome:
             windows10-64-ccov/debug: 7200
             macosx64-ccov/debug: 10800
             linux.*/debug: 5400
             default: 3600
     mozharness:
         mochitest-flavor: browser
         chunked: true
     # Bug 1281241: migrating to m3.large instances
-    instance-size:
-        by-test-platform:
-            linux64-jsdcov/opt: xlarge
-            default: default
+    instance-size: default
     allow-software-gl-layers: false
 
 browser-instrumentation:
     description: "Extra instrumentation for a browser-chrome run (XUL, XBL, etc)"
     suite: mochitest/browser-chrome-instrumentation
     treeherder-symbol: M(inst)
     loopback-video: true
     tier: 3
@@ -227,31 +217,24 @@ mochitest-clipboard:
                 android-em.*:
                     # note that Android runs fewer suites than other platforms
                     - --test-suite=mochitest-plain-clipboard
                 default:
                     - --mochitest-suite=plain-clipboard,chrome-clipboard,browser-chrome-clipboard
 
 mochitest-devtools-chrome:
     description: "Mochitest devtools-chrome run"
-    suite:
-        by-test-platform:
-            linux64-jsdcov/opt: mochitest/mochitest-devtools-chrome-coverage
-            default: mochitest/mochitest-devtools-chrome-chunked
+    suite: mochitest/mochitest-devtools-chrome-chunked
     treeherder-symbol: M(dt)
     loopback-video: true
     max-run-time:
         by-test-platform:
             windows10-64-ccov/debug: 7200
             macosx64-ccov/debug: 9000
             default: 5400
-    run-on-projects:
-        by-test-platform:
-            linux64-jsdcov/opt: ['try']  # jsdcov only on try, Bug 1442823
-            default: built-projects
     chunks:
         by-test-platform:
             linux64-ccov/debug: 12
             windows10-64-ccov/debug: 10
             macosx64-ccov/debug: 15
             default: 8
     mozharness:
         mochitest-flavor: chrome
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -114,20 +114,16 @@ linux64-qr/debug:
 linux64-ccov/debug:
     build-platform: linux64-ccov/debug
     test-sets:
         - common-tests
         - web-platform-tests
         - awsy
         - talos
         - ccov-code-coverage-tests
-linux64-jsdcov/opt:
-    build-platform: linux64-jsdcov/opt
-    test-sets:
-        - jsdcov-code-coverage-tests
 
 ##
 # Windows platforms (matching /windows.*/)
 
 # win32
 windows7-32/debug:
     build-platform: win32/debug
     test-sets:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -169,22 +169,16 @@ windows-qr-tests:
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
     - reftest
 
-jsdcov-code-coverage-tests:
-    - mochitest
-    - mochitest-browser-chrome
-    - mochitest-devtools-chrome
-    - xpcshell
-
 ccov-code-coverage-tests:
     - test-coverage
     - test-coverage-wpt
 
 windows-reftest-gpu:
     - reftest-gpu
 
 windows-tests:
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -167,19 +167,18 @@ web-platform-tests-wdspec-headless:
 
 test-verify-wpt:
     description: "Extra verification of web-platform tests modified on this push"
     suite: test-verify
     treeherder-symbol: TVw
     max-run-time: 10800
     run-on-projects:
         by-test-platform:
-            # do not run on ccov or jsdcov
+            # do not run on ccov
             .*-ccov/.*: []
-            .*-jsdcov/.*: []
             .*-asan/.*: []
             # do not run on beta or release: usually just confirms earlier results
             .*-msvc/.*: ['mozilla-central', 'try']
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         extra-options:
             - --verify
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -22,20 +22,17 @@ job-defaults:
         requires-signed-builds:
             by-test-platform:
                 windows10-64-asan/opt: false    # No XPCShell on ASAN yet
                 windows.*: true
                 default: false
 
 xpcshell:
     description: "xpcshell test run"
-    suite:
-        by-test-platform:
-            linux64-jsdcov/opt: xpcshell/xpcshell-coverage
-            default: xpcshell
+    suite: xpcshell
     treeherder-symbol: X(X)
     run-on-projects:
         by-test-platform:
             windows10-64-asan/opt: []  # No XPCShell on ASAN yet
             default: built-projects
     chunks:
         by-test-platform:
             linux32/debug: 12
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -24,17 +24,16 @@ VARIANTS = [
     'devedition',
     'pgo',
     'asan',
     'stylo',
     'stylo-disabled',
     'stylo-sequential',
     'qr',
     'ccov',
-    'jsdcov',
 ]
 
 
 def get_variant(test_platform):
     for v in VARIANTS:
         if '-{}/'.format(v) in test_platform:
             return v
     return ''
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -747,17 +747,17 @@ def handle_suite_category(config, tests)
             if not any(arg.startswith(category_arg) for arg in extra):
                 extra.append('{}={}'.format(category_arg, flavor))
 
         yield test
 
 
 @transforms.add
 def enable_code_coverage(config, tests):
-    """Enable code coverage for the ccov and jsdcov build-platforms"""
+    """Enable code coverage for the ccov build-platforms"""
     for test in tests:
         if 'ccov' in test['build-platform']:
             # Do not run tests on fuzzing or opt build
             if 'opt' in test['build-platform'] or 'fuzzing' in test['build-platform']:
                 test['run-on-projects'] = []
                 continue
             # Skip this transform for android code coverage builds.
             if 'android' in test['build-platform']:
@@ -802,22 +802,16 @@ def enable_code_coverage(config, tests):
                 test['mozharness']['extra-options'].append('--add-option')
                 test['mozharness']['extra-options'].append('--no-upload-results')
                 test['mozharness']['extra-options'].append('--add-option')
                 test['mozharness']['extra-options'].append('--tptimeout,15000')
             if 'raptor' in test['test-name']:
                 test['max-run-time'] = 1800
                 if 'linux' in test['build-platform']:
                     test['docker-image'] = {"in-tree": "desktop1604-test"}
-        elif 'jsdcov' in test['build-platform']:
-            # Ensure we always run on the projects defined by the build, unless the test
-            # is try only or shouldn't run at all.
-            if test['run-on-projects'] not in [[], ['try']]:
-                test['run-on-projects'] = 'built-projects'
-            test['mozharness'].setdefault('extra-options', []).append('--jsd-code-coverage')
         yield test
 
 
 @transforms.add
 def handle_run_on_projects(config, tests):
     """Handle translating `built-projects` appropriately"""
     for test in tests:
         if test['run-on-projects'] == 'built-projects':
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -546,17 +546,17 @@ class TryOptionSyntax(object):
         attr = task.attributes.get
 
         def check_run_on_projects():
             if attr('nightly') and not self.include_nightly:
                 return False
             return set(['try', 'all']) & set(attr('run_on_projects', []))
 
         # Don't schedule code coverage when try option syntax is used
-        if 'ccov' in attr('build_platform', []) or 'jsdcov' in attr('build_platform', []):
+        if 'ccov' in attr('build_platform', []):
             return False
 
         def match_test(try_spec, attr_name):
             run_by_default = True
             if attr('build_type') not in self.build_types:
                 return False
             if self.platforms is not None:
                 if attr('build_platform') not in self.platforms:
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2569,19 +2569,16 @@ toolbar#nav-bar {
         # for test manifest parsing.
         mozinfo.update({
             "e10s": options.e10s,
             "headless": options.headless,
             "serviceworker_e10s": self.extraPrefs.get(
                 'dom.serviceWorkers.parent_intercept', False),
         })
 
-        if options.jscov_dir_prefix is not None:
-            mozinfo.update({'coverage': True})
-
         self.setTestRoot(options)
 
         # Despite our efforts to clean up servers started by this script, in practice
         # we still see infrequent cases where a process is orphaned and interferes
         # with future tests, typically because the old server is keeping the port in use.
         # Try to avoid those failures by checking for and killing servers before
         # trying to start new ones.
         self.killNamedProc('ssltunnel')
--- a/testing/mozharness/mozharness/mozilla/testing/codecoverage.py
+++ b/testing/mozharness/mozharness/mozilla/testing/codecoverage.py
@@ -34,22 +34,16 @@ code_coverage_config_options = [
       "help": "Whether per-test coverage should be collected."
       }],
     [["--disable-ccov-upload"],
      {"action": "store_true",
       "dest": "disable_ccov_upload",
       "default": False,
       "help": "Whether test run should package and upload code coverage data."
       }],
-    [["--jsd-code-coverage"],
-     {"action": "store_true",
-      "dest": "jsd_code_coverage",
-      "default": False,
-      "help": "Whether JSDebugger code coverage should be run."
-      }],
     [["--java-code-coverage"],
      {"action": "store_true",
       "dest": "java_code_coverage",
       "default": False,
       "help": "Whether Java code coverage should be run."
       }],
 ]
 
@@ -384,33 +378,16 @@ class CodeCoverageMixin(SingleTestMixin)
             return False
 
         return True
 
     @PostScriptAction('run-tests')
     def _package_coverage_data(self, action, success=None):
         dirs = self.query_abs_dirs()
 
-        if self.jsd_code_coverage_enabled:
-            # Setup the command for compression
-            jsdcov_dir = dirs['abs_blob_upload_dir']
-            zipFile = os.path.join(jsdcov_dir, "jsdcov_artifacts.zip")
-
-            self.info("Beginning compression of JSDCov artifacts...")
-            with zipfile.ZipFile(zipFile, 'w', zipfile.ZIP_DEFLATED) as z:
-                for filename in os.listdir(jsdcov_dir):
-                    if filename.startswith("jscov") and filename.endswith(".json"):
-                        path = os.path.join(jsdcov_dir, filename)
-                        z.write(path, filename)
-                        # Delete already compressed JSCov artifacts.
-                        os.remove(path)
-
-            self.info("Completed compression of JSDCov artifacts!")
-            self.info("Path to JSDCov compressed artifacts: " + zipFile)
-
         if not self.code_coverage_enabled:
             return
 
         if self.per_test_coverage:
             if not self.per_test_reports:
                 self.info("No tests were found...not saving coverage data.")
                 return
 
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -1148,20 +1148,16 @@ class XPCShellTests(object):
         for k, v in self.mozInfo.items():
             if isinstance(k, unicode):
                 k = k.encode('ascii')
             fixedInfo[k] = v
         self.mozInfo = fixedInfo
 
         mozinfo.update(self.mozInfo)
 
-        # Add a flag to mozinfo to indicate that code coverage is enabled.
-        if self.jscovdir:
-            mozinfo.update({"coverage": True})
-
         return True
 
     def runTests(self, options, testClass=XPCShellTestThread, mobileArgs=None):
         """
           Run xpcshell tests.
         """
 
         global gotSIGINT
--- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
@@ -38,10 +38,9 @@ skip-if = os != "win"
 requesttimeoutfactor = 4
 [test_remove.js]
 [test_removeDir.js]
 requesttimeoutfactor = 4
 [test_removeEmptyDir.js]
 [test_reset.js]
 [test_shutdown.js]
 [test_telemetry.js]
-skip-if = coverage # bug 1336672
 [test_unique.js]
--- a/toolkit/components/startup/tests/unit/xpcshell.ini
+++ b/toolkit/components/startup/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = head_startup.js
 skip-if = toolkit == 'android'
 
 [test_startup_crash.js]
-skip-if = coverage # bug 1336673
--- a/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
+++ b/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
@@ -3,12 +3,10 @@ head = head.js
 firefox-appdir = browser
 skip-if = os == 'android'
 subprocess = true
 support-files =
   data_text_file.txt
   data_test_script.py
 
 [test_subprocess.js]
-skip-if = coverage
 [test_subprocess_getEnvironment.js]
-skip-if = coverage
 [test_subprocess_pathSearch.js]
--- a/tools/profiler/tests/xpcshell.ini
+++ b/tools/profiler/tests/xpcshell.ini
@@ -10,9 +10,8 @@ skip-if = true
 skip-if = true
 [test_pause.js]
 [test_enterjit_osr.js]
 [test_enterjit_osr_disabling.js]
 skip-if = !debug
 [test_enterjit_osr_enabling.js]
 skip-if = !debug
 [test_asm.js]
-skip-if = coverage # bug 1336674