Bug 1555454 - migrate xpcshelltests to macosx1014 r=gbrown
authorEdwin Gao <egao@mozilla.com>
Tue, 11 Jun 2019 18:36:19 +0000
changeset 478299 7130574015aa569d11068960dac16f138bb571bc
parent 478298 29fdbc50c0a1427ef1d62745f1c4ba5c43710f16
child 478300 909890c99ec40b3aa81a7575915a655b94238353
push id36140
push userdluca@mozilla.com
push dateWed, 12 Jun 2019 12:02:49 +0000
treeherdermozilla-central@6b172dc138ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1555454
milestone69.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 1555454 - migrate xpcshelltests to macosx1014 r=gbrown Changes: - move xpcshell from macosx1010 to macosx1014 - updated regex for macosx1014 xpcshell to run on 2 chunks for all variants (for now) Differential Revision: https://phabricator.services.mozilla.com/D34561
netwerk/test/unit/xpcshell.ini
taskcluster/ci/test/test-sets.yml
taskcluster/ci/test/xpcshell.yml
toolkit/components/backgroundhangmonitor/tests/xpcshell.ini
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -312,17 +312,17 @@ fail-if = os == "android"
 [test_resumable_channel.js]
 [test_resumable_truncate.js]
 [test_safeoutputstream.js]
 [test_schema_2_migration.js]
 [test_schema_3_migration.js]
 [test_simple.js]
 [test_sockettransportsvc_available.js]
 [test_socks.js]
-skip-if = (verify && (os == 'mac')) || (debug && (os == 'mac')) #Bug 1140656
+skip-if = os == 'mac' && (verify || debug || os_version == '10.14') #Bug 1140656
 # Bug 675039: test fails consistently on Android
 fail-if = os == "android"
 # http2 unit tests require us to have node available to run the spdy and http2 server
 [test_http2.js]
 # This used to be hasNode, but that caused too many issues with tests being
 # silently disabled, so now we explicitly call out the platforms not known
 # to have node installed.
 skip-if = (os == "android") || verify
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -331,34 +331,33 @@ macosx1014-64-tests:
     - reftest
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu
     - test-verify-wpt
     - web-platform-tests
     - web-platform-tests-reftests
     - web-platform-tests-wdspec
-    # - xpcshell
+    - xpcshell
 
 macosx1014-64-qr-tests:
     - crashtest
     - reftest
 
 macosx64-tests:
     - gtest
     - jsreftest
     - mochitest
     - mochitest-browser-chrome
     - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-media
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     # - mochitest-webgl2-ext test timeouts
-    - xpcshell
 
 macosx64-talos:
     - talos-bcv
     - talos-chrome
     - talos-damp
     - talos-dromaeojs
     - talos-g1
     - talos-g4
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -40,22 +40,22 @@ xpcshell:
     run-on-projects:
         by-test-platform:
             windows10-64-asan/opt: []  # No XPCShell on ASAN yet
             windows10-aarch64/opt: ['try', 'mozilla-central']
             android-em-4.*/.*: ['try', 'mozilla-central']  # bug 1548659
             default: built-projects
     chunks:
         by-test-platform:
+            .*-ccov/debug: 6
             android-em-4.*: 8
             android-em-4.3-arm7-api-16/debug: 12
             android-em-7.*: 3
-            macosx10(10|14)-64/.*: 2
+            macosx.*(?!-ccov)...../.*: 2
             linux64(-qr)?/debug: 6
-            .*-ccov/debug: 6
             windows(7-32|10-64)(-shippable|-devedition|-asan|.*-qr)?/.*: 2
             windows10-aarch64/opt: 3
             default: 5
     instance-size:
         by-test-platform:
             android-em.*: xlarge
             default: default
     max-run-time:
--- a/toolkit/components/backgroundhangmonitor/tests/xpcshell.ini
+++ b/toolkit/components/backgroundhangmonitor/tests/xpcshell.ini
@@ -1,4 +1,4 @@
 [test_BHRObserver.js]
 # BHR is disabled on android and outside of nightly
-skip-if = debug || os == "android" || release_or_beta
+skip-if = debug || os == "android" || release_or_beta || (os == "mac")  # mac due to 1417723
 support-files = child_cause_hang.js