Bug 1536208 - removing old aarch64 manifest annotations. r=aryx,application-update-reviewers,bytesized

Differential Revision: https://phabricator.services.mozilla.com/D157677

accessible/tests/browser/browser.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = a11y_checks || (os == 'win' && processor == 'aarch64') # 1534855
+skip-if = a11y_checks # 1534855
 subsuite = a11y
 support-files =
   !/accessible/tests/mochitest/*.js
@@ -8,26 +8,36 @@ support-files =
   shared-head.js
 
 [browser_shutdown_acc_reference.js]
-skip-if = (os == 'linux' && debug && bits == 64) #Bug 1421307
+skip-if =
+  os == "linux" && debug #Bug 1421307
 [browser_shutdown_doc_acc_reference.js]
 [browser_shutdown_multi_acc_reference_obj.js]
 [browser_shutdown_multi_acc_reference_doc.js]
 [browser_shutdown_multi_reference.js]
 [browser_shutdown_parent_own_reference.js]
-skip-if = (verify && debug && (os == 'win'))
+skip-if =
+  os == "win" && verify && debug
 [browser_shutdown_pref.js]
 [browser_shutdown_proxy_acc_reference.js]
-skip-if = (os == 'win')
+skip-if =
+  os == "win"
 [browser_shutdown_proxy_doc_acc_reference.js]
-skip-if = (os == 'win') || (verify && debug)
+skip-if =
+  os == "win" && verify && debug
 [browser_shutdown_multi_proxy_acc_reference_doc.js]
-skip-if = (os == 'win') || (verify && debug && (os == 'linux'))
+skip-if =
+  os == "win"
+  os == "linux" && verify && debug
 [browser_shutdown_multi_proxy_acc_reference_obj.js]
-skip-if = (os == 'win') || (verify && debug && (os == 'linux'))
+skip-if =
+  os == "win"
+  os == "linux" && verify && debug
 [browser_shutdown_remote_no_reference.js]
-skip-if = (verify && debug && (os == 'win'))
+skip-if =
+  os == "win" && verify && debug
 [browser_shutdown_remote_only.js]
 [browser_shutdown_remote_own_reference.js]
 [browser_shutdown_scope_lifecycle.js]
 [browser_shutdown_start_restart.js]
-skip-if = (verify && debug)
+skip-if =
+  verify && debug

accessible/tests/browser/general/browser.ini

@@ -4,7 +4,7 @@ support-files =
   !/accessible/tests/browser/shared-head.js
   head.js
   !/accessible/tests/mochitest/*.js
-skip-if = a11y_checks || (os == 'win' && processor == 'aarch64') # windows-aarch64, 1534811
+skip-if = a11y_checks
 
 [browser_test_doc_creation.js]
 [browser_test_urlbar.js]

browser/base/content/test/contextMenu/browser.ini

@@ -16,59 +16,70 @@ support-files =
 [browser_contextmenu_badiframe.js]
 https_first_disabled = true
 skip-if =
-  os == 'win' && bits == 64 # Bug 1719856
-  os == 'linux' && socketprocess_networking
+  os == "win" # Bug 1719856
+  os == "linux" && socketprocess_networking
 [browser_contextmenu_contenteditable.js]
 [browser_contextmenu_inspect.js]
-skip-if = os == 'linux' && socketprocess_networking
+skip-if =
+  os == "linux" && socketprocess_networking
 [browser_contextmenu_keyword.js]
-skip-if = toolkit == "gtk" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
+skip-if =
+  os == "linux" # disabled on Linux due to bug 513558
 [browser_contextmenu_loadblobinnewtab.js]
 support-files = browser_contextmenu_loadblobinnewtab.html
-skip-if = os == 'linux' && socketprocess_networking
+skip-if =
+  os == "linux" && socketprocess_networking
 [browser_contextmenu_save_blocked.js]
-skip-if = os == 'linux' && socketprocess_networking
+skip-if =
+  os == "linux" && socketprocess_networking
 [browser_contextmenu_share_macosx.js]
 support-files =
   browser_contextmenu_shareurl.html
-run-if = os == "macosx"
+run-if =
+  os == "mac"
 [browser_contextmenu_share_win.js]
 https_first_disabled = true
 support-files =
   browser_contextmenu_shareurl.html
-run-if = os == "win"
+run-if =
+  os == "win"
 [browser_contextmenu_spellcheck.js]
 https_first_disabled = true
-skip-if = toolkit == "gtk" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
+skip-if = 
+  os == "linux"
 [browser_contextmenu_touch.js]
 skip-if = true # Bug 1424433, disable due to very high frequency failure rate also on Windows 10
 [browser_contextmenu_linkopen.js]
-skip-if = os == 'linux' && socketprocess_networking
+skip-if = 
+  os == "linux" && socketprocess_networking
 [browser_contextmenu_iframe.js]
 support-files =
   test_contextmenu_iframe.html
-skip-if = os == 'linux' && socketprocess_networking
+skip-if =
+  os == "linux" && socketprocess_networking
 [browser_contextmenu.js]
 tags = fullscreen
 skip-if =
-  toolkit == "gtk"
+  os == "linux"
   verify
-  os == "win" && processor == "aarch64" # disabled on Linux due to bug 513558, aarch64 due to 1531590
-  os == 'linux' && socketprocess_networking
 [browser_contextmenu_input.js]
-skip-if = toolkit == "gtk" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
+skip-if =
+  os == "linux"
 [browser_copy_image_link.js]
 support-files =
   doggy.png
   firebird.png
   firebird.png^headers^
-skip-if = os == 'linux' && socketprocess_networking
+skip-if =
+  os == "linux" && socketprocess_networking
 [browser_utilityOverlay.js]
 https_first_disabled = true
-skip-if = os == 'linux' && socketprocess_networking
+skip-if =
+  os == "linux" && socketprocess_networking
 [browser_utilityOverlayPrincipal.js]
 https_first_disabled = true
 [browser_view_image.js]
 support-files =
   test_view_image_revoked_cached_blob.html
-skip-if = os == 'linux' && socketprocess_networking
+skip-if =
+  os == "linux" && socketprocess_networking

browser/base/content/test/performance/browser.ini

@@ -28,8 +28,8 @@ support-files =
 skip-if =
   asan
   debug
-  (os == 'win') # Win32 because of intermittent OOM failures, bug 1533141 for aarch64, Bug 1775626
-  (os == 'linux' && socketprocess_networking) # Bug 1382809, bug 1369959
+  os == "win" # Bug 1775626
+  os == "linux" && socketprocess_networking # Bug 1382809, bug 1369959
 [browser_panel_vsync.js]
 support-files =
   !/browser/components/downloads/test/browser/head.js
@@ -38,7 +38,6 @@ https_first_disabled = true
 skip-if =
   !debug
   apple_catalina  # platform migration
-  os == 'win' && fission  # Bug 1713890 - new Fission platform triage
   socketprocess_networking
 [browser_startup.js]
 [browser_startup_content.js]
@@ -50,33 +49,42 @@ support-files =
   file_empty.html
   StartupContentSubframe.jsm
 [browser_startup_flicker.js]
-run-if = debug || nightly_build # Requires StartupRecorder.jsm, which isn't shipped everywhere by default
+run-if =
+  debug
+  nightly_build # Requires StartupRecorder.jsm, which isn't shipped everywhere by default
 [browser_startup_hiddenwindow.js]
-skip-if = os == 'mac'
+skip-if =
+  os == "mac"
 [browser_tabclose_grow.js]
 [browser_tabclose.js]
 skip-if =
-  os == 'linux' && devedition # Bug 1737131
-  os == 'mac' # Bug 1531417
-  os == 'win' # Bug 1488537, Bug 1497713
+  os == "linux" && devedition # Bug 1737131
+  os == "mac" # Bug 1531417
+  os == "win" # Bug 1488537, Bug 1497713
 [browser_tabdetach.js]
 [browser_tabopen.js]
 skip-if =
   apple_catalina # Bug 1594274
-  os == 'mac' && !debug # Bug 1705492
-  os == 'linux' && !debug # Bug 1705492
+  os == "mac" && !debug # Bug 1705492
+  os == "linux" && !debug # Bug 1705492
 [browser_tabopen_squeeze.js]
 [browser_tabstrip_overflow_underflow.js]
-skip-if = (verify && !debug && (os == 'win')) || (os == 'win' && bits == 32) # Bug 1502255
+skip-if = 
+  os == "win" && verify && !debug
+  os == 'win' && bits == 32
 [browser_tabswitch.js]
-skip-if = os == 'win' #Bug 1455054
+skip-if =
+  os == "win" #Bug 1455054
 [browser_toolbariconcolor_restyles.js]
 [browser_urlbar_keyed_search.js]
-skip-if = (os == 'win' && bits == 32) || (os == 'mac') # Disabled on Win32 because of intermittent OOM failures (bug 1448241), macosx1014 due to 1565619
+skip-if =
+  os == "win" && bits == 32 # # Disabled on Win32 because of intermittent OOM failures (bug 1448241)
 [browser_urlbar_search.js]
-skip-if = (debug || ccov) && (os == 'linux' || os == 'win') || (os == 'win' && bits == 32) # Disabled on Linux and Windows debug and ccov due to intermittent timeouts. Bug 1414126, bug 1426611. Disabled on Win32 because of intermittent OOM failures (bug 1448241)
+skip-if = 
+  os == "linux" && (debug || ccov) # Disabled on Linux debug and ccov due to intermittent timeouts. Bug 1414126.
+  os == "win" && (debug || ccov) # Disabled on Windows debug and ccov due to intermittent timeouts. bug 1426611.
+  os == "win" && bits == 32
 [browser_vsync_accessibility.js]
 [browser_window_resize.js]
 [browser_windowclose.js]
 [browser_windowopen.js]
-skip-if =  (os == 'win' && bits == 32 && fission) # new fission tests on win7

browser/base/content/test/performance/io/browser.ini

@@ -1,9 +1,11 @@
 [DEFAULT]
 # Currently disabled on debug due to debug-only failures, see bug 1549723.
 # Disabled on Linux asan due to bug 1549729.
-# Disabled on Windows Arm64 due to bug 1551493.
 # Disabled on Windows asan due to intermittent startup hangs, bug 1629824.
-skip-if = debug || tsan || (os == "linux" && asan) || (os == "win" && (asan || processor == "aarch64"))
+skip-if =
+  debug
+  tsan
+  asan
 # to avoid overhead when running the browser normally, StartupRecorder.jsm will
 # do almost nothing unless browser.startup.record is true.
 # gfx.canvas.willReadFrequently.enable is just an optimization, but needs to be
@@ -24,7 +26,6 @@ environment =
 [../browser_startup_mainthreadio.js]
 skip-if =
   apple_silicon  # bug 1707724
-  os == "win" && bits == 32
   socketprocess_networking
 [../browser_startup_content_mainthreadio.js]
 [../browser_startup_syncIPC.js]

security/manager/ssl/tests/unit/xpcshell-smartcards.ini

@@ -6,7 +6,9 @@ skip-if = toolkit == 'android'
 support-files =
 
 [test_osclientcerts_module.js]
-skip-if = (os != 'win' && os != 'mac') || processor == 'aarch64'
+skip-if =
+  os == "linux"
+  os == "android"
 [test_pkcs11_module.js]
 [test_pkcs11_moduleDB.js]
 [test_pkcs11_safe_mode.js]

toolkit/components/telemetry/tests/unit/xpcshell.ini

@@ -24,11 +24,15 @@ generated-files =
 [test_UserInteraction_annotations.js]
 # BHR is disabled on tsan, asan, android and outside of Nightly.
 skip-if =
-  debug || asan || tsan || os == "android" || release_or_beta
+  debug
+  asan
+  tsan
+  os == "android"
+  release_or_beta
   apple_catalina # Bug 1713329
   apple_silicon  # bug 1707747
-  os == 'win' && bits == 32 && !debug  # Bug 1781452
-  os == 'linux' && !debug  # Bug 1781452
+  os == "win" && bits == 32 && !debug  # Bug 1781452
+  os == "linux" && !debug  # Bug 1781452
 run-sequentially = very high failure rate in parallel
 [test_client_id.js]
 [test_MigratePendingPings.js]
@@ -65,13 +69,14 @@ skip-if = os == "android" # Disabled due to intermittent orange on Android
 tags = addons
 [test_TelemetrySession.js]
 tags = addons
-skip-if = (verify && debug && os == 'linux')
+skip-if =
+  os == "linux" && verify && debug
 [test_TelemetrySession_abortedSessionQueued.js]
 skip-if = os == "android"
 [test_TelemetrySession_activeTicks.js]
 [test_TelemetrySend.js]
 skip-if =
-  (os == "linux") && ccov # Bug 1701874
+  os == "linux" && ccov # Bug 1701874
 [test_ChildHistograms.js]
 skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 tags = addons
@@ -94,11 +99,11 @@ skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 [test_ModulesPing.js]
 skip-if =
-  (os == "win" && processor == "aarch64") # bug 
   apple_silicon  # bug 1707747
   apple_catalina # Bug 1713329
 [test_PingSender.js]
-skip-if = (os == "android") || (os == "linux" && bits == 32)
+skip-if =
+  os == "android"
 [test_TelemetryAndroidEnvironment.js]
 [test_TelemetryUtils.js]
 [test_ThirdPartyModulesPing.js]
@@ -109,6 +114,6 @@ tags = coverage
 [test_PrioPing.js]
 [test_bug1555798.js]
 [test_UninstallPing.js]
-run-if = os == 'win'
+run-if = os == "win"
 [test_failover_retry.js]
 skip-if = os == "android" # Android doesn't support telemetry though some tests manage to pass with xpcshell

toolkit/crashreporter/test/unit/xpcshell-phc.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_crashreporter.js
-skip-if = toolkit == 'android' || (os == "win" && processor == "aarch64") # 1536217
+skip-if = toolkit == "android" # 1536217
 support-files =
   crasher_subprocess_head.js
   crasher_subprocess_tail.js

toolkit/crashreporter/test/unit_ipc/xpcshell-phc.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 head =
-skip-if = toolkit == 'android' || (os == "win" && processor == "aarch64") # 1536217
+skip-if = toolkit == "android" # 1536217
 support-files =
   !/toolkit/crashreporter/test/unit/crasher_subprocess_head.js
   !/toolkit/crashreporter/test/unit/crasher_subprocess_tail.js

toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = toolkit == 'android'
+skip-if = toolkit == "android"
 tags = addons
 head = head_addons.js
 firefox-appdir = browser
@@ -48,7 +48,8 @@ tags = webextensions
 [test_general.js]
 [test_getInstallSourceFromHost.js]
 [test_gmpProvider.js]
-skip-if = appname != "firefox" || (os == "win" && processor == "aarch64") # bug 1536637
+skip-if =
+  appname != "firefox"
 [test_harness.js]
 [test_hidden.js]
 [test_install.js]
@@ -82,7 +83,7 @@ skip-if = require_signing
 skip-if = require_signing
 [test_registerchrome.js]
 [test_registry.js]
-skip-if = os != 'win'
+skip-if = os != "win"
 [test_reinstall_disabled_addon.js]
 [test_reload.js]
 # There's a problem removing a temp file without manually clearing the cache on Windows
@@ -97,7 +98,8 @@ tags = webextensions
 skip-if = condprof  # Bug 1769184 - by design for now
 [test_sideload_scopes.js]
 head = head_addons.js head_sideload.js
-skip-if = os == "linux" # Bug 1613268
+skip-if =
+  os == "linux" # Bug 1613268
   condprof  # Bug 1769184 - by design for now
 [test_sideloads.js]
 [test_sideloads_after_rebuild.js]
@@ -110,11 +112,14 @@ skip-if = true
 [test_signed_langpack.js]
 [test_signed_long.js]
 [test_signed_updatepref.js]
-skip-if = require_signing || !allow_legacy_extensions
+skip-if =
+  require_signing
+  !allow_legacy_extensions
 [test_signed_verify.js]
 [test_startup.js]
 head = head_addons.js head_sideload.js
-skip-if = os == "linux" # Bug 1613268
+skip-if =
+  os == "linux" # Bug 1613268
   condprof  # Bug 1769184 - by design for now
 [test_startup_enable.js]
 [test_startup_isPrivileged.js]

toolkit/mozapps/update/tests/unit_service_updater/xpcshell.ini

@@ -6,10 +6,9 @@
 
 [DEFAULT]
 skip-if =
-  (verify && (os == 'win'))
-  (os == "win" && processor == "aarch64")
-  (os == 'win' && ccov) # 1532801
-  (os == "win" && asan) # updater binary must be signed for these tests, but it isn't in this build config
+  os == "win" && verify
+  os == "win" && ccov # 1532801
+  os == "win" && asan # updater binary must be signed for these tests, but it isn't in this build config
 tags = appupdate
 head = head_update.js
 support-files =

tools/profiler/tests/xpcshell/xpcshell.ini

@@ -15,7 +15,6 @@ skip-if = tsan # Times out on TSan, bug 1612707
 skip-if = true
 [test_pause.js]
 [test_enterjit_osr.js]
-skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1536652
 [test_enterjit_osr_disabling.js]
 skip-if = !debug
 [test_enterjit_osr_enabling.js]
@@ -24,12 +23,10 @@ skip-if = !debug
 [test_feature_mainthreadio.js]
 skip-if =
   release_or_beta
-  (os == "win" && processor == "aarch64") # The IOInterposer is in an ifdef, aarch64 due to 1536657
-  (os == "win" && socketprocess_networking)
+  os == "win" && socketprocess_networking
 [test_feature_fileioall.js]
 skip-if =
   release_or_beta
-  (os == "win" && processor == "aarch64") # The IOInterposer is in an ifdef, aarch64 due to 1536657
 
 # The sanitizer checks appears to overwrite our own memory hooks in xpcshell tests,
 # and no allocation markers are gathered. Skip this test in that configuration.
@@ -52,8 +49,8 @@ skip-if =
 # additional coverage there, so it's better to be a bit more reliable.
 [test_feature_stackwalking.js]
 skip-if =
-  (os == "mac" && release_or_beta)
-  (os == "linux" && release_or_beta && !debug)
+  os == "mac" && release_or_beta
+  os == "linux" && release_or_beta && !debug
   asan
   tsan
 
@@ -63,11 +60,12 @@ skip-if = tsan # Times out on TSan, bug 1612707
 # See the comment on test_feature_stackwalking.js
 [test_merged_stacks.js]
 skip-if =
-  (os == "mac" && release_or_beta)
-  (os == "linux" && release_or_beta && !debug)
+  os == "mac" && release_or_beta
+  os == "linux" && release_or_beta && !debug
   asan
   tsan
 
 [test_assertion_helper.js]
 [test_feature_java.js]
-skip-if = toolkit != 'android'
+skip-if =
+  os != "android"