Backed out changeset 23e68db8afd7 (bug 1301212) for breaking XPC tests on a CLOSED TREE

taskcluster/ci/desktop-test/test-sets.yml

@@ -91,7 +91,6 @@ windows-vm-tests:
 ccov-code-coverage-tests:
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
-    - xpcshell
 
 jsdcov-code-coverage-tests:
     - mochitest-browser-chrome

taskcluster/ci/desktop-test/tests.yml

@@ -555,10 +555,6 @@ xpcshell:
     description: "xpcshell test run"
     suite: xpcshell
     treeherder-symbol: tc-X()
-    run-on-projects:
-        by-test-platform:
-            linux64-ccov/opt: []
-            default: ['all']
     chunks:
         by-test-platform:
             # win.*: 1
@@ -577,12 +573,7 @@ xpcshell:
                     - unittests/linux_unittest.py
                     - remove_executables.py
         extra-options:
-            by-test-platform:
-                linux64-ccov/opt:
-                    - --xpcshell-suite=xpcshell
-                    - --code-coverage
-                default:
-                    - -xpcshell-suite=xpcshell
+            - --xpcshell-suite=xpcshell
     # Bug 1281241: migrating to m3.large instances
     instance-size: legacy
     allow-software-gl-layers: false