From f5afc22625abd02bb85307e52a04f42b4fb8c849 Mon Sep 17 00:00:00 2001 From: Ben Hearsum Date: Fri, 6 Aug 2021 19:16:55 +0000 Subject: [PATCH] Bug 1714200: skip failing xpcshell tests on M1 machines r=jmaher Differential Revision: https://phabricator.services.mozilla.com/D121225 --- .../formautofill/test/unit/xpcshell.ini | 30 ++++++++++++++----- .../adb/xpcshell/xpcshell.ini | 1 + devtools/server/tests/xpcshell/xpcshell.ini | 2 ++ security/manager/ssl/tests/unit/xpcshell.ini | 1 + .../antitracking/test/xpcshell/xpcshell.ini | 2 ++ .../test/xpcshell/native_messaging.ini | 4 ++- .../test/xpcshell/xpcshell-common-e10s.ini | 8 +++-- .../test/xpcshell/xpcshell-common.ini | 12 ++++++-- .../test/xpcshell/xpcshell-content.ini | 1 + .../telemetry/tests/unit/xpcshell.ini | 1 + .../subprocess/test/xpcshell/xpcshell.ini | 4 ++- toolkit/modules/tests/xpcshell/xpcshell.ini | 1 + 12 files changed, 53 insertions(+), 14 deletions(-) diff --git a/browser/extensions/formautofill/test/unit/xpcshell.ini b/browser/extensions/formautofill/test/unit/xpcshell.ini index 6e031d6c2d09..710fdec3cf48 100644 --- a/browser/extensions/formautofill/test/unit/xpcshell.ini +++ b/browser/extensions/formautofill/test/unit/xpcshell.ini @@ -41,12 +41,18 @@ skip-if = (os == "linux") && ccov # bug 1614100 [test_activeStatus.js] [test_addressDataLoader.js] [test_addressRecords.js] +skip-if = + apple_silicon [test_autofillFormFields.js] -skip-if = tsan # Times out, bug 1612707 +skip-if = + tsan # Times out, bug 1612707 + apple_silicon [test_collectFormFields.js] [test_createRecords.js] [test_creditCardRecords.js] -skip-if = tsan # Times out, bug 1612707 +skip-if = + tsan # Times out, bug 1612707 + apple_silicon [test_extractLabelStrings.js] [test_findLabelElements.js] [test_getAdaptedProfiles.js] @@ -54,7 +60,9 @@ skip-if = tsan # Times out, bug 1612707 [test_getFormInputDetails.js] [test_getInfo.js] [test_getRecords.js] -skip-if = tsan # Times out, bug 1612707 +skip-if = + tsan # Times out, bug 1612707 + apple_silicon [test_isAvailable.js] [test_isCJKName.js] [test_isFieldEligibleForAutofill.js] @@ -68,16 +76,24 @@ skip-if = tsan # Times out, bug 1612707 [test_profileAutocompleteResult.js] [test_phoneNumber.js] [test_reconcile.js] -skip-if = tsan # Times out, bug 1612707 +skip-if = + tsan # Times out, bug 1612707 + apple_silicon [test_savedFieldNames.js] [test_toOneLineAddress.js] [test_storage_tombstones.js] -skip-if = tsan # Times out, bug 1612707 +skip-if = + tsan # Times out, bug 1612707 + apple_silicon [test_storage_remove.js] -skip-if = tsan # Times out, bug 1612707 +skip-if = + tsan # Times out, bug 1612707 + apple_silicon [test_storage_syncfields.js] [test_transformFields.js] -skip-if = tsan # Times out, bug 1612707 +skip-if = + tsan # Times out, bug 1612707 + apple_silicon [test_sync.js] head = head.js ../../../../../services/sync/tests/unit/head_appinfo.js ../../../../../services/common/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_helpers.js ../../../../../services/sync/tests/unit/head_http_server.js skip-if = tsan # Times out, bug 1612707 diff --git a/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini b/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini index d2b34c105a59..4b8c74e2e193 100644 --- a/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini +++ b/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini @@ -8,4 +8,5 @@ support-files = [test_adb.js] run-sequentially = An extension having the same id is installed/uninstalled in different tests +skip-if = apple_silicon [test_prepare-tcp-connection.js] diff --git a/devtools/server/tests/xpcshell/xpcshell.ini b/devtools/server/tests/xpcshell/xpcshell.ini index 566a502cee5c..c22469931c67 100644 --- a/devtools/server/tests/xpcshell/xpcshell.ini +++ b/devtools/server/tests/xpcshell/xpcshell.ini @@ -178,6 +178,7 @@ skip-if = true # breakpoint sliding is not supported bug 1525685 [test_stepping-10.js] [test_stepping-11.js] [test_stepping-12.js] +skip-if = apple_silicon [test_stepping-13.js] [test_stepping-14.js] [test_stepping-15.js] @@ -207,6 +208,7 @@ skip-if = true # breakpoint sliding is not supported bug 1525685 [test_watchpoint-02.js] [test_watchpoint-03.js] [test_watchpoint-04.js] +skip-if = apple_silicon [test_watchpoint-05.js] [test_breakpoint-actor-map.js] skip-if = true # tests for breakpoint actors are obsolete bug 1524374 diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/security/manager/ssl/tests/unit/xpcshell.ini index 9f4c581cdfd9..fbffc8e1ce27 100644 --- a/security/manager/ssl/tests/unit/xpcshell.ini +++ b/security/manager/ssl/tests/unit/xpcshell.ini @@ -178,6 +178,7 @@ run-sequentially = hardcoded ports [test_ocsp_url.js] run-sequentially = hardcoded ports [test_oskeystore.js] +skip-if = apple_silicon [test_osreauthenticator.js] # Reauthentication has been implemented on Windows and MacOS, so running this # test results in the OS popping up a dialog, which means we can't run it in diff --git a/toolkit/components/antitracking/test/xpcshell/xpcshell.ini b/toolkit/components/antitracking/test/xpcshell/xpcshell.ini index 16a828a6745c..218988a8e400 100644 --- a/toolkit/components/antitracking/test/xpcshell/xpcshell.ini +++ b/toolkit/components/antitracking/test/xpcshell/xpcshell.ini @@ -11,6 +11,8 @@ skip-if = toolkit == "android" # Bug 1697936 [test_staticPartition_font.js] support-files = data/font.woff +skip-if = + apple_silicon [test_staticPartition_image.js] [test_staticPartition_authhttp.js] [test_staticPartition_prefetch.js] diff --git a/toolkit/components/extensions/test/xpcshell/native_messaging.ini b/toolkit/components/extensions/test/xpcshell/native_messaging.ini index b64cda83c8ba..d1551c3b3ecb 100644 --- a/toolkit/components/extensions/test/xpcshell/native_messaging.ini +++ b/toolkit/components/extensions/test/xpcshell/native_messaging.ini @@ -9,7 +9,9 @@ support-files = tags = webextensions [test_ext_native_messaging.js] -skip-if = (os == "win" && processor == "aarch64") # bug 1530841 +skip-if = + (os == "win" && processor == "aarch64") # bug 1530841 + apple_silicon [test_ext_native_messaging_perf.js] skip-if = tsan # Unreasonably slow, bug 1612707 [test_ext_native_messaging_unresponsive.js] diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini index 332921e68538..12e8dee6be69 100644 --- a/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini +++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini @@ -3,11 +3,15 @@ [test_ext_webRequest_filterResponseData.js] # tsan failure is for test_filter_301 timing out, bug 1674773 -skip-if = tsan || os == "android" && debug +skip-if = + tsan || os == "android" && debug + apple_silicon [test_ext_webRequest_redirect_StreamFilter.js] [test_ext_webRequest_responseBody.js] skip-if = os == "android" && debug [test_ext_webRequest_startup_StreamFilter.js] skip-if = os == "android" && debug [test_ext_webRequest_viewsource_StreamFilter.js] -skip-if = tsan # Bug 1683730 \ No newline at end of file +skip-if = + tsan # Bug 1683730 + apple_silicon diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini index bb62bad173a4..70dae0901b29 100644 --- a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini +++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini @@ -44,7 +44,9 @@ run-sequentially = node server exceptions dont replay well skip-if = appname == "thunderbird" || os == "android" || (os == "mac" && debug) # CP service is disabled on Android, macosx1014/debug due to 1564534 run-sequentially = node server exceptions dont replay well [test_ext_cookieBehaviors.js] -skip-if = appname == "thunderbird" || tsan || os == "android" # Bug 1683730, Android: Bug 1700482 +skip-if = + appname == "thunderbird" || tsan || os == "android" # Bug 1683730, Android: Bug 1700482 + apple_silicon [test_ext_cookies_firstParty.js] skip-if = appname == "thunderbird" || os == "android" || tsan # Android: Bug 1680132. tsan: Bug 1683730 [test_ext_cookies_samesite.js] @@ -55,9 +57,13 @@ skip-if = (os == "win" && debug) # Bug 1485567 [test_ext_contentscript_async_loading.js] skip-if = os == 'android' && debug # The generated script takes too long to load on Android debug [test_ext_contentscript_context.js] -skip-if = tsan # Bug 1683730 +skip-if = + tsan # Bug 1683730 + apple_silicon [test_ext_contentscript_context_isolation.js] -skip-if = tsan # Bug 1683730 +skip-if = + tsan # Bug 1683730 + apple_silicon [test_ext_contentscript_create_iframe.js] [test_ext_contentscript_csp.js] [test_ext_contentscript_css.js] diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini index 4d762d2c82b7..ee93e508c395 100644 --- a/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini +++ b/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini @@ -16,4 +16,5 @@ skip-if = !nightly_build [test_ext_shadowdom.js] skip-if = ccov && os == 'linux' # bug 1607581 [test_ext_web_accessible_resources.js] +skip-if = apple_silicon [test_ext_web_accessible_resources_matches.js] diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini index 30ae469301e4..5efb160532af 100644 --- a/toolkit/components/telemetry/tests/unit/xpcshell.ini +++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini @@ -28,6 +28,7 @@ generated-files = skip-if = debug || asan || tsan || os == "android" || release_or_beta apple_catalina # Bug 1713329 + apple_silicon [test_client_id.js] [test_MigratePendingPings.js] [test_TelemetryHistograms.js] diff --git a/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini b/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini index 27eaa9fc7744..7b497eb01e3c 100644 --- a/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini +++ b/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini @@ -8,6 +8,8 @@ support-files = data_test_script.py [test_subprocess.js] -skip-if = verify +skip-if = + verify + apple_silicon [test_subprocess_getEnvironment.js] [test_subprocess_pathSearch.js] diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini index debe905ddc7c..051e68236532 100644 --- a/toolkit/modules/tests/xpcshell/xpcshell.ini +++ b/toolkit/modules/tests/xpcshell/xpcshell.ini @@ -37,6 +37,7 @@ skip-if = toolkit == 'android' [test_ObjectUtils.js] [test_ObjectUtils_strict.js] [test_osKeyStore.js] +skip-if = apple_silicon [test_PermissionsUtils.js] [test_Preferences.js] [test_Promise.js]