commit f5df00d78c5c96a887b576bc3c4e149766c256e8 parent 825551cdbca9e7d94d905cbc21203b34596ac394 Author: Tom Marble <tmarble@info9.net> Date: Tue, 7 Oct 2025 22:35:55 +0000 Bug 1991964 - Remove android_version from test manifests r=jmaher,necko-reviewers,media-playback-reviewers,devtools-reviewers,permissions-reviewers,dom-worker-reviewers,asuth,jesup,nchevobbe,alwu Now includes both code changes and manifest changes. See also Bug 1991960 Signed-off-by: Tom Marble <tmarble@info9.net> Differential Revision: https://phabricator.services.mozilla.com/D267466 Diffstat:
45 files changed, 203 insertions(+), 245 deletions(-)
diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/xpcshell.toml b/devtools/shared/heapsnapshot/tests/xpcshell/xpcshell.toml @@ -33,8 +33,7 @@ support-files = [ ["test_DominatorTree_02.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_DominatorTree_03.js"] @@ -129,8 +128,7 @@ skip-if = [ ["test_ReadHeapSnapshot_worker.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_SaveHeapSnapshot.js"] diff --git a/devtools/shared/tests/xpcshell/xpcshell.toml b/devtools/shared/tests/xpcshell/xpcshell.toml @@ -16,8 +16,7 @@ support-files = [ ["test_debugger_client.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_defineLazyPrototypeGetter.js"] @@ -30,8 +29,7 @@ skip-if = [ ["test_executeSoon.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_fetch-bom.js"] @@ -56,8 +54,7 @@ skip-if = [ ["test_natural-sort.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_pluralForm-english.js"] @@ -66,8 +63,7 @@ skip-if = [ ["test_prettifyCSS.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_require.js"] @@ -76,8 +72,7 @@ skip-if = [ ["test_require_raw.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_safeErrorString.js"] diff --git a/docshell/test/navigation/mochitest.toml b/docshell/test/navigation/mochitest.toml @@ -124,7 +124,7 @@ skip-if = [ ["test_bug279495.html"] skip-if = [ "os == 'android' && debug && processor == 'x86_64'", # Bug 1781600 - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt && fission", # Bug 1781600 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt && fission", # Bug 1781600 ] ["test_bug344861.html"] @@ -194,7 +194,7 @@ skip-if = ["!sessionHistoryInParent"] # the old implementation behaves inconsist ["test_child.html"] skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt && fission", # Bug 1982945 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt && fission", # Bug 1982945 ] ["test_contentpolicy_block_window.html"] @@ -213,7 +213,7 @@ support-files = ["file_evict_from_bfcache.html"] skip-if = [ "http2", "http3", - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt && fission", # Bug 1982945 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt && fission", # Bug 1982945 ] ["test_load_history_entry.html"] @@ -245,7 +245,7 @@ support-files = [ skip-if = [ "http2", "http3", - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt && fission", # Bug 1982945 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt && fission", # Bug 1982945 ] ["test_online_offline_bfcache.html"] diff --git a/docshell/test/unit/xpcshell.toml b/docshell/test/unit/xpcshell.toml @@ -15,14 +15,12 @@ support-files = [ ["test_URIFixup_info.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_URIFixup_search.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_allowJavascript.js"] diff --git a/dom/canvas/test/mochitest.toml b/dom/canvas/test/mochitest.toml @@ -211,7 +211,6 @@ skip-if = [ ["test_bug902651.html"] ["test_bug1215072.html"] -skip-if = ["os == 'android' && android_version == '24' && processor == 'x86_64' && debug"] # Bug 1908622 ["test_bug1567544.html"] subsuite = "gpu" diff --git a/dom/canvas/test/webgl-conf/generated-mochitest.toml b/dom/canvas/test/webgl-conf/generated-mochitest.toml @@ -5227,7 +5227,6 @@ subsuite = "webgl2-core" fail-if = [ "os == 'linux'", "os == 'mac'", - "os == 'android' && android_version == '33'", ] ["generated/test_2_conformance2__attribs__gl-vertex-attrib-i-render.html"] @@ -5409,7 +5408,6 @@ subsuite = "webgl2-core" ["generated/test_2_conformance2__extensions__ovr_multiview2_transform_feedback.html"] subsuite = "webgl2-core" -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_2_conformance2__extensions__promoted-extensions-in-shaders.html"] subsuite = "webgl2-core" @@ -5674,7 +5672,7 @@ skip-if = [ "os == 'mac' && os_version == '10.15' && processor == 'x86_64'", "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", "os == 'win'", - "os == 'android' && android_version == '34'", + "os == 'android' && os_version == '14'", ] ["generated/test_2_conformance2__misc__views-with-offsets.html"] @@ -5718,7 +5716,6 @@ subsuite = "webgl2-core" ["generated/test_2_conformance2__programs__gl-get-frag-data-location.html"] subsuite = "webgl2-core" -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_2_conformance2__programs__sampler-uniforms.html"] subsuite = "webgl2-core" @@ -5870,7 +5867,7 @@ subsuite = "webgl2-core" subsuite = "webgl2-core" skip-if = [ "os == 'win'", - "os == 'android' && android_version == '34'", + "os == 'android' && os_version == '14'", ] ["generated/test_2_conformance2__rendering__draw-buffers.html"] @@ -8366,7 +8363,7 @@ subsuite = "webgl2-core" skip-if = [ "os == 'linux'", "os == 'win'", - "os == 'android' && android_version == '34'", + "os == 'android' && os_version == '14'", ] ["generated/test_2_conformance2__textures__misc__copy-texture-image-webgl-specific.html"] @@ -8384,7 +8381,6 @@ subsuite = "webgl2-core" ["generated/test_2_conformance2__textures__misc__immutable-tex-render-feedback.html"] subsuite = "webgl2-core" fail-if = [ - "os == 'android' && android_version == '33'", "os == 'linux'", "os == 'mac' && os_version == '10.15' && processor == 'x86_64'", "os == 'mac' && os_version == '14.70' && processor == 'x86_64'", @@ -8393,7 +8389,7 @@ fail-if = [ ] skip-if = [ "os == 'linux' && debug", - "os == 'android' && android_version == '34' && debug", + "os == 'android' && os_version == '14' && debug", ] ["generated/test_2_conformance2__textures__misc__integer-cubemap-specification-order-bug.html"] @@ -11372,7 +11368,6 @@ subsuite = "webgl2-core" ["generated/test_2_conformance__rendering__blending.html"] subsuite = "webgl2-core" -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_2_conformance__rendering__canvas-alpha-bug.html"] subsuite = "webgl2-core" @@ -14770,7 +14765,6 @@ subsuite = "webgl1-core" ["generated/test_conformance__extensions__ext-sRGB.html"] subsuite = "webgl1-core" -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_conformance__extensions__ext-shader-texture-lod.html"] subsuite = "webgl1-core" @@ -14878,7 +14872,7 @@ subsuite = "webgl1-core" ["generated/test_conformance__extensions__webgl-depth-texture.html"] subsuite = "webgl1-core" -skip-if = ["os == 'android' && android_version == '34'"] +skip-if = ["os == 'android' && os_version == '14'"] ["generated/test_conformance__extensions__webgl-draw-buffers-broadcast-return.html"] subsuite = "webgl1-core" @@ -16713,7 +16707,6 @@ subsuite = "webgl1-core" ["generated/test_conformance__rendering__blending.html"] subsuite = "webgl1-core" -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_conformance__rendering__canvas-alpha-bug.html"] subsuite = "webgl1-core" @@ -17301,8 +17294,7 @@ subsuite = "webgl1-core" skip-if = [ "win11_2009", # win11 - 50/50 intermittent "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # win11 - 50/50 intermittent - "os == 'android' && android_version == '33'", # Bug 1873144 - "os == 'android' && android_version == '34'", # Bug 1873144 + "os == 'android' && os_version == '14'", # Bug 1873144 ] ["generated/test_conformance__textures__misc__texture-npot.html"] diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.toml b/dom/canvas/test/webgl-conf/mochitest-errata.toml @@ -5,7 +5,7 @@ # See python/mozbuild/mozbuild/mozinfo.py for incoming data. ########## -# android_version strings +# os_version strings # https://en.wikipedia.org/wiki/Android_version_history # * Android 13.0: 33 (pixel 5 phones) # * Android 14.0: 34 (samsung a55 phones) @@ -29,7 +29,6 @@ fail-if = ["true"] fail-if = [ "os == 'linux'", "os == 'mac'", - "os == 'android' && android_version == '33'", ] ["generated/test_2_conformance2__attribs__gl-vertex-attrib-i-render.html"] @@ -160,7 +159,6 @@ skip-if = ["os == 'android'"] skip-if = ["os == 'android'"] ["generated/test_2_conformance2__extensions__ovr_multiview2_transform_feedback.html"] -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_2_conformance2__extensions__required-extensions.html"] # has_etc1 == has_etc should be true. Was false @@ -237,7 +235,7 @@ skip-if = [ "os == 'mac' && os_version == '10.15' && processor == 'x86_64'", "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", "os == 'win'", - "os == 'android' && android_version == '34'", + "os == 'android' && os_version == '14'", ] ["generated/test_2_conformance2__offscreencanvas__offscreencanvas-sync.html"] @@ -251,7 +249,6 @@ skip-if = [ ["generated/test_2_conformance2__programs__gl-get-frag-data-location.html"] # gl.getFragDataLocation(programEs2, 'gl_FragColor') should be -1. Was 0. -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_2_conformance2__query__occlusion-query-scissor.html"] skip-if = ["os == 'linux' && os_version == '24.04' && processor == 'x86_64' && display == 'x11'"] @@ -322,7 +319,7 @@ fail-if = ["os == 'linux'"] # check COLOR_ATTACHMENT0 skip-if = [ "os == 'win'", - "os == 'android' && android_version == '34'", + "os == 'android' && os_version == '14'", ] # - @@ -931,7 +928,7 @@ skip-if = ["os == 'linux'"] skip-if = [ "os == 'linux'", "os == 'win'", - "os == 'android' && android_version == '34'", + "os == 'android' && os_version == '14'", ] ["generated/test_2_conformance2__textures__misc__generate-mipmap-with-large-base-level.html"] @@ -940,7 +937,6 @@ skip-if = [ ["generated/test_2_conformance2__textures__misc__immutable-tex-render-feedback.html"] # E.g. getError expected: NO_ERROR. Was INVALID_VALUE : after draw with texture fail-if = [ - "os == 'android' && android_version == '33'", "os == 'linux'", "os == 'mac' && os_version == '10.15' && processor == 'x86_64'", "os == 'mac' && os_version == '14.70' && processor == 'x86_64'", @@ -950,7 +946,7 @@ fail-if = [ # Assertion failure: [GFX1]: void mozilla::gl::GLContext::fFramebufferTexture2D(GLenum, GLenum, GLenum, GLuint, GLint): Generated unexpected GL_INVALID_VALUE error skip-if = [ "os == 'linux' && debug", - "os == 'android' && android_version == '34' && debug", + "os == 'android' && os_version == '14' && debug", ] ["generated/test_2_conformance2__textures__misc__origin-clean-conformance-offscreencanvas.html"] @@ -1448,7 +1444,6 @@ skip-if = ["os == 'win'"] ["generated/test_2_conformance__rendering__bind-framebuffer-flush-bug.html"] ["generated/test_2_conformance__rendering__blending.html"] -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_2_conformance__rendering__gl-scissor-test.html"] fail-if = ["os == 'linux' && os_version == '24.04' && processor == 'x86_64' && display == 'x11'"] @@ -1620,7 +1615,6 @@ skip-if = ["os == 'win'"] skip-if = ["os == 'mac' && os_version == '10.15'"] ["generated/test_conformance__extensions__ext-sRGB.html"] -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_conformance__extensions__oes-texture-float-with-image-data.html"] @@ -1639,7 +1633,7 @@ skip-if = ["os == 'android'"] ["generated/test_conformance__extensions__webgl-compressed-texture-size-limit.html"] ["generated/test_conformance__extensions__webgl-depth-texture.html"] -skip-if = ["os == 'android' && android_version == '34'"] +skip-if = ["os == 'android' && os_version == '14'"] ["generated/test_conformance__glsl__bugs__array-of-struct-with-int-first-position.html"] # Crashes @@ -1954,7 +1948,6 @@ skip-if = ["os == 'android'"] ["generated/test_conformance__rendering__blending.html"] # Android 13.0 Pixel5 AArch64 # dom/canvas/test/webgl-conf/generated/test_conformance__rendering__blending.html | Expected [100,2,3,4], was [1,2,3,4] -fail-if = ["os == 'android' && android_version == '33'"] ["generated/test_conformance__rendering__clipping-wide-points.html"] fail-if = ["os == 'linux'"] @@ -2204,8 +2197,7 @@ skip-if = ["os == 'android'"] skip-if = [ "win11_2009", # win11 - 50/50 intermittent "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # win11 - 50/50 intermittent - "os == 'android' && android_version == '33'", # Bug 1873144 - "os == 'android' && android_version == '34'", # Bug 1873144 + "os == 'android' && os_version == '14'", # Bug 1873144 ] #################### # Bugs surfaced during fx93 CTS update diff --git a/dom/canvas/test/webgl-mochitest/mochitest.toml b/dom/canvas/test/webgl-mochitest/mochitest.toml @@ -34,7 +34,6 @@ fail-if = ["true"] ["ensure-exts/test_EXT_sRGB.html"] ["ensure-exts/test_EXT_shader_texture_lod.html"] -fail-if = ["os == 'android' && android_version == '33'"] ["ensure-exts/test_EXT_texture_compression_bptc.html"] fail-if = [ @@ -126,12 +125,10 @@ fail-if = [ ] ["ensure-exts/test_WEBGL_compressed_texture_s3tc.html"] -fail-if = ["os == 'android' && android_version == '33'"] ["ensure-exts/test_WEBGL_depth_texture.html"] ["ensure-exts/test_WEBGL_draw_buffers.html"] -fail-if = ["os == 'android' && android_version == '33'"] ["ensure-exts/test_WEBGL_provoking_vertex.html"] fail-if = [ @@ -153,7 +150,7 @@ fail-if = [ ["test_backends.html"] tags = "os_integration" -skip-if = ["os == 'android' && android_version == '34'"] +skip-if = ["os == 'android' && os_version == '14'"] ["test_canvas_size.html"] @@ -210,7 +207,7 @@ skip-if = [ "win11_2009", # Unofficial DXGL support regressed by bug 1632249 "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", - "os == 'android' && android_version == '34'", + "os == 'android' && os_version == '14'", ] ["test_privileged_exts.html"] diff --git a/dom/ipc/tests/xpcshell.toml b/dom/ipc/tests/xpcshell.toml @@ -12,6 +12,5 @@ ["test_sharedMap.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64' && debug", - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug", + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug", ] diff --git a/dom/media/autoplay/test/mochitest/mochitest.toml b/dom/media/autoplay/test/mochitest/mochitest.toml @@ -42,7 +42,7 @@ support-files = [ ["test_autoplay_contentEditable.html"] skip-if = [ "isolated_process", # Bug 1709948 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982948 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982948 ] ["test_autoplay_gv_play_request.html"] diff --git a/dom/media/mediasource/test/mochitest_compat.toml b/dom/media/mediasource/test/mochitest_compat.toml @@ -297,7 +297,6 @@ skip-if = ["os == 'android' && verify"] # Crash ["test_SeekNoData_mp4.html"] ["test_SeekToEnd_mp4.html"] -skip-if = ["os == 'android' && android_version == '24' && processor == 'x86_64' && opt"] # Bug 1781577 ["test_SeekTwice_mp4.html"] diff --git a/dom/quota/test/xpcshell/telemetry/xpcshell.toml b/dom/quota/test/xpcshell/telemetry/xpcshell.toml @@ -18,8 +18,7 @@ support-files = [ skip-if = [ "appname == 'thunderbird'", # bug 1942789 "inc_origin_init", - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_qm_first_initialization_attempt.js"] diff --git a/dom/security/test/csp/mochitest.toml b/dom/security/test/csp/mochitest.toml @@ -433,7 +433,6 @@ skip-if = [ ["test_csp_error_messages.html"] support-files = ["file_csp_error_messages.html"] -skip-if = ["os == 'android' && android_version == '24' && processor == 'x86_64' && debug"] # Bug 1915293 ["test_csp_frame_ancestors_about_blank.html"] support-files = [ diff --git a/dom/serviceworkers/test/mochitest-common.toml b/dom/serviceworkers/test/mochitest-common.toml @@ -216,7 +216,7 @@ support-files = [ ["test_abrupt_completion.html"] skip-if = [ "os == 'linux' && os_version == '24.04' && processor == 'x86_64' && display == 'x11'", # Bug 1615164 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1776997 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1776997 ] ["test_async_waituntil.html"] @@ -316,7 +316,7 @@ skip-if = [ skip-if = ["xorigin"] # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object ["test_installation_simple.html"] -skip-if = ["os == 'android' && android_version == '34' && processor == 'x86_64'"] # Bug 1816639 +skip-if = ["os == 'android' && os_version == '14' && processor == 'x86_64'"] # Bug 1816639 ["test_match_all.html"] @@ -428,7 +428,7 @@ support-files = [ "test_serviceworker_interfaces.js", "!/dom/tests/mochitest/general/interface_exposure_checker.js", ] -skip-if = ["os == 'android' && android_version == '34' && processor == 'x86_64'"] # Bug 1777011 +skip-if = ["os == 'android' && os_version == '14' && processor == 'x86_64'"] # Bug 1777011 ["test_serviceworker_not_sharedworker.html"] skip-if = [ diff --git a/dom/tests/mochitest/beacon/mochitest.toml b/dom/tests/mochitest/beacon/mochitest.toml @@ -16,8 +16,7 @@ run-sequentially = ["true"] # bug 1784963 - beacon-handler shares state skip-if = [ "http2", "http3", - "os == 'android' && android_version == '24' && processor == 'x86_64'", # Bug 1784963 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1784963 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1784963 "os == 'linux' && os_version == '24.04' && processor == 'x86_64' && display == 'x11' && xorigin", # Bug 1784963 ] diff --git a/dom/tests/mochitest/fetch/mochitest.toml b/dom/tests/mochitest/fetch/mochitest.toml @@ -94,7 +94,7 @@ skip-if = [ ["test_fetch_cors.html"] scheme = "https" skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1858891 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1858891 "http3", "http2", ] diff --git a/dom/webtransport/test/xpcshell/xpcshell.toml b/dom/webtransport/test/xpcshell/xpcshell.toml @@ -6,22 +6,21 @@ run-if = ["!socketprocess_networking"] # XXX figure out why android doesn't get MOZHTTP3_PORT skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # https://bugzilla.mozilla.org/show_bug.cgi?id=1807925 "os == 'win' && os_version == '11.2009' && processor == 'x86_64' && msix && appname == 'thunderbird'", # https://bugzilla.mozilla.org/show_bug.cgi?id=1960463 ] ["test_close.js"] skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug", # Bug 1982953 - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt", # Bug 1982953 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug", # Bug 1982953 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt", # Bug 1982953 ] ["test_simple_conn.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug", # Bug 1982953 - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt", # Bug 1982953 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug", # Bug 1982953 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt", # Bug 1982953 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug TBD "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug TBD ] @@ -29,8 +28,8 @@ skip-if = [ ["test_simple_stream.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug", # Bug 1982953 - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt", # Bug 1982953 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug", # Bug 1982953 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt", # Bug 1982953 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug TBD "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug TBD ] diff --git a/extensions/permissions/test/unit/xpcshell.toml b/extensions/permissions/test/unit/xpcshell.toml @@ -30,7 +30,7 @@ firefox-appdir = "browser" ["test_permmanager_load_invalid_entries.js"] skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'" , # Bug 1834534 + "os == 'android' && os_version == '14' && processor == 'x86_64'" , # Bug 1834534 ] ["test_permmanager_local_files.js"] diff --git a/extensions/pref/autoconfig/test/unit/xpcshell.toml b/extensions/pref/autoconfig/test/unit/xpcshell.toml @@ -10,11 +10,10 @@ support-files = [ "autoconfig-no-sandbox.js", ] run-if = ["!msix"] # Does not work in MSIX builds. -skip-if = ["os == 'android' && android_version == '24' && processor == 'x86_64' && debug"] ["test_autoconfig.js"] skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug && !fission", # Bug 1982954 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug && !fission", # Bug 1982954 ] ["test_autoconfig_custom_path.js"] @@ -26,11 +25,11 @@ run-if = ["os == 'linux'"] ["test_autoconfig_no_sandbox.js"] run-sequentially = ["true"] # fails more than 50% of the time in parallel skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug && !fission", # Bug 1982954 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug && !fission", # Bug 1982954 ] ["test_autoconfig_nonascii.js"] run-sequentially = ["true"] # fails 70% of the time in parallel skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug && !fission", # Bug 1982954 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug && !fission", # Bug 1982954 ] diff --git a/intl/locale/tests/unit/xpcshell.toml b/intl/locale/tests/unit/xpcshell.toml @@ -9,8 +9,7 @@ support-files = [ ["test_intl_on_workers.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", # Bug 1309447 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1309447 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1309447 ] ["test_langPackMatcher.js"] diff --git a/js/xpconnect/tests/unit/xpcshell.toml b/js/xpconnect/tests/unit/xpcshell.toml @@ -195,8 +195,7 @@ support-files = [ ["test_defineESModuleGetters_options_worker.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_envChain_frameScript.js"] @@ -237,22 +236,19 @@ skip-if = [ ["test_import_global_contextual_worker.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_import_global_current.js"] ["test_import_global_current_worker.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_import_global_worker.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_import_stack.js"] diff --git a/netwerk/test/mochitests/mochitest.toml b/netwerk/test/mochitests/mochitest.toml @@ -81,7 +81,7 @@ skip-if = [ ["test_1421324.html"] skip-if = [ "xorigin", - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1981321 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1981321 ] ["test_1425031.html"] diff --git a/netwerk/test/unit/xpcshell.toml b/netwerk/test/unit/xpcshell.toml @@ -99,8 +99,7 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_altsvc_http3.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 @@ -310,8 +309,7 @@ run-if = ["processor == 'x86'"] ["test_bug1683176.js"] run-if = ["debug"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86' && socketprocess_networking", "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && socketprocess_networking", "os == 'win' && os_version == '10.2009' && processor == 'x86_64' && socketprocess_networking", @@ -319,8 +317,7 @@ skip-if = [ ["test_bug1725766.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", # Bug 1589327 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1589327 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1589327 ] ["test_bug1830022.js"] @@ -340,8 +337,7 @@ run-if = ["os != 'win'"] # skip because 0.0.0.0 is invalid in windows platform run-sequentially = ["true"] # node server exceptions dont replay well run-if = ["!socketprocess_networking"] # Bug 1960490 skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", # Bug 1622901 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1622901 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1622901 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1808048 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1808048 "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # Bug 1808048 @@ -498,8 +494,7 @@ prefs = ["security.allow_eval_with_system_principal=true"] ["test_client_auth_with_proxy.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_coaleasing_h2_and_h3_connection.js"] @@ -548,8 +543,7 @@ run-sequentially = [ ["test_cookies_profile_close.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64' && !fission", # Bug 1700483 - "os == 'android' && android_version == '34' && processor == 'x86_64' && !fission", # Bug 1700483 + "os == 'android' && os_version == '14' && processor == 'x86_64' && !fission", # Bug 1700483 ] ["test_cookies_purge_counting.js"] @@ -684,8 +678,7 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_hpke_out_of_process.js"] firefox-appdir = "browser" skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", # Bug 1904406 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1904406 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1904406 ] ["test_http1-proxy.js"] @@ -701,8 +694,7 @@ skip-if = [ ["test_http2-proxy.js"] run-sequentially = ["true"] # one http2 node proxy is used for all tests, this test is using global session counter skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_http2.js"] @@ -719,7 +711,7 @@ head = "head_channels.js head_cache.js head_cookies.js head_trr.js head_http3.js ["test_http3.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 @@ -730,14 +722,13 @@ skip-if = [ "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 ] ["test_http3_421.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 @@ -746,8 +737,7 @@ skip-if = [ ["test_http3_alt_svc.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 ] @@ -755,8 +745,7 @@ skip-if = [ run-sequentially = ["true"] # node server exceptions dont replay well run-if = ["!socketprocess_networking"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'mac' && os_version == '11.20' && arch == 'aarch64'", # Bug 1866067 "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1866067 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1808049 @@ -767,7 +756,7 @@ skip-if = [ ["test_http3_direct_proxy.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1808049 "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # Bug 1808049 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1808049 @@ -776,8 +765,7 @@ skip-if = [ ["test_http3_dns_retry.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -786,7 +774,7 @@ skip-if = [ ["test_http3_early_hint_listener.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1808049 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1808049 "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # Bug 1808049 @@ -814,15 +802,13 @@ skip-if = [ ["test_http3_fatal_stream_error.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 ] ["test_http3_kyber.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", @@ -831,7 +817,7 @@ skip-if = [ ["test_http3_large_post.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -841,8 +827,7 @@ skip-if = [ run-sequentially = ["true"] # node server exceptions dont replay well run-if = ["!socketprocess_networking"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -851,8 +836,7 @@ skip-if = [ ["test_http3_perf.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # Bug 1807931 @@ -861,7 +845,7 @@ skip-if = [ ["test_http3_prio_disabled.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # Bug 1807931 @@ -890,8 +874,7 @@ skip-if = [ ["test_http3_server.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 "verify", ] @@ -902,8 +885,7 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_http3_timings.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -912,7 +894,7 @@ skip-if = [ ["test_http3_trans_close.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 @@ -921,7 +903,7 @@ skip-if = [ ["test_http3_version1.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -930,8 +912,7 @@ skip-if = [ ["test_http3_with_third_party_roots.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -976,8 +957,7 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_httpssvc_retry_with_ech.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", # Bug 1622901 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1622901 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1622901 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1808048 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1808048 "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # Bug 1808048 @@ -1011,7 +991,6 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_ip_address_space_lna_glean.js"] ["test_ip_space_glean.js"] -skip-if = ["os == 'android' && android_version == '24' && processor == 'x86_64'"] ["test_large_port.js"] @@ -1019,8 +998,7 @@ skip-if = ["os == 'android' && android_version == '24' && processor == 'x86_64'" ["test_loadgroup_glean.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_local_network_access.js"] @@ -1065,7 +1043,6 @@ skip-if = [ ["test_networking_over_socket_process.js"] run-sequentially = ["true"] # node server exceptions dont replay well run-if = ["socketprocess_networking"] -skip-if = ["os == 'android' && android_version == '24' && processor == 'x86_64'"] ["test_no_cookies_after_last_pb_exit.js"] @@ -1136,7 +1113,7 @@ skip-if = [ ["test_progress_no_proxy_and_proxy.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -1162,7 +1139,6 @@ skip-if = [ ["test_proxyDNS_leak.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && socketprocess_networking", "os == 'win' && os_version == '11.26100' && processor == 'x86' && socketprocess_networking", ] @@ -1185,7 +1161,7 @@ skip-if = [ "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && opt", "os == 'win' && os_version == '11.26100' && processor == 'x86' && opt", "os == 'win' && os_version == '11.2009' && processor == 'x86_64' && opt", # Bug 1866777 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1866777 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1866777 ] ["test_range_requests.js"] @@ -1337,7 +1313,7 @@ skip-if = ["os == 'win' && os_version == '11.26100' && processor == 'x86_64' && ["test_tls13_disabled.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1808048 ] @@ -1347,8 +1323,7 @@ skip-if = [ ["test_tls_handshake_timing.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -1398,8 +1373,7 @@ skip-if = ["appname == 'thunderbird'"] # bug 1760097 firefox-appdir = "browser" # needed for resource:///modules/policies/schema.sys.mjs to be registered run-if = ["!socketprocess_networking"] # confirmation state isn't passed cross-process skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_trr_extended_error.js"] @@ -1410,8 +1384,7 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_trr_https_fallback.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", "os == 'win' && os_version == '11.26100' && processor == 'x86'", "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", @@ -1420,8 +1393,7 @@ skip-if = [ ["test_trr_https_rr_with_cname.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1808049 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1808049 "os == 'win' && os_version == '11.26100' && processor == 'x86_64'", # Bug 1808049 @@ -1501,15 +1473,14 @@ run-sequentially = ["true"] # node server exceptions dont replay well ["test_websocket_with_h3_active.js"] run-sequentially = ["true"] # node server exceptions dont replay well skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix'", # Bug 1808049 ] ["test_webtransport_simple.js"] run-if = ["!socketprocess_networking"] # This test will be fixed in bug 1796556 skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", "os == 'win' && os_version == '10.2009' && processor == 'x86_64'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86'", # Bug 1807931 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807931 diff --git a/netwerk/test/unit_ipc/xpcshell.toml b/netwerk/test/unit_ipc/xpcshell.toml @@ -152,7 +152,7 @@ prefs = ["network.allow_raw_sockets_in_content_processes=true"] ["test_http3_prio_disabled_wrap.js"] run-sequentially = ["true"] # http3server skip-if = [ - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1982955 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1982955 "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && msix", # Bug 1807925 ] diff --git a/services/common/tests/unit/xpcshell.toml b/services/common/tests/unit/xpcshell.toml @@ -11,14 +11,12 @@ support-files = ["test_storage_adapter/**"] ["test_hawkclient.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_hawkrequest.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_kinto.js"] @@ -40,8 +38,7 @@ tags = "remote-settings blocklist" ["test_tokenserverclient.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", ] ["test_uptake_telemetry.js"] diff --git a/services/settings/test/unit/xpcshell.toml b/services/settings/test/unit/xpcshell.toml @@ -35,8 +35,7 @@ support-files = ["test_remote_settings_startup_bundle/**"] ["test_remote_settings_utils_telemetry.js"] skip-if = [ - "os == 'android' && android_version == '24' && processor == 'x86_64'", # Bug 1739463 - "os == 'android' && android_version == '34' && processor == 'x86_64'", # Bug 1739463 + "os == 'android' && os_version == '14' && processor == 'x86_64'", # Bug 1739463 ] ["test_remote_settings_worker.js"] diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py @@ -3543,7 +3543,6 @@ toolbar#nav-bar { "xorigin": options.xOriginTests, "condprof": options.conditionedProfile, "msix": "WindowsApps" in options.app, - "android_version": mozinfo.info.get("android_version", -1), "android": mozinfo.info.get("android", False), "is_emulator": mozinfo.info.get("is_emulator", False), "coverage": mozinfo.info.get("coverage", False), diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py @@ -17,6 +17,7 @@ import mozcrash import mozinfo from mochitest_options import MochitestArgumentParser, build_obj from mozdevice import ADBDeviceFactory, ADBTimeoutError, RemoteProcessMonitor +from mozinfo.platforminfo import android_api_to_os_version from mozscreenshot import dump_device_screen, dump_screen from runtests import MessageLogger, MochitestDesktop @@ -100,13 +101,14 @@ class MochiRemote(MochitestDesktop): if self.device.process_exist(self.appName): self.log.warning("unable to kill %s before running tests!" % self.appName) + android_version = str(self.device.version) + os_version = android_api_to_os_version(android_version) # Add Android version (SDK level) to mozinfo so that manifest entries # can be conditional on android_version. self.log.info( - "Android sdk version '%s'; will use this to filter manifests" - % str(self.device.version) + f"Android sdk version '{android_version}' corresponds to os_version '{os_version}'; use os_version to filter manifests" ) - mozinfo.info["android_version"] = str(self.device.version) + mozinfo.info["os_version"] = os_version mozinfo.info["is_emulator"] = self.device._device_serial.startswith("emulator-") def cleanup(self, options, final=False): diff --git a/testing/mochitest/tests/Harness_sanity/mochitest.toml b/testing/mochitest/tests/Harness_sanity/mochitest.toml @@ -38,7 +38,6 @@ skip-if = ["true"] #depends on fix for bug 1048446 ["test_sanityEventUtils.html"] skip-if = [ "fission && xorigin", # Bug 1716411 - New fission platform triage - "os == 'android' && android_version == '24' && processor == 'x86_64' && opt", # Bug 1704064 ] ["test_sanityException.html"] diff --git a/testing/mozbase/manifestparser/tests/edit-manifest-after.toml b/testing/mozbase/manifestparser/tests/edit-manifest-after.toml @@ -19,8 +19,8 @@ skip-if = [ ["bug_100.js"] skip-if = [ "apple_catalina", # Bug 200 - "os == 'android' && android_version == '34' && debug", # Bug 100, will be carried over "os == 'android' && debug", # Bug 100, will be carried over + "os == 'android' && os_version == '14' && debug", # Bug 100, will be carried over ] ["test_bar.html"] diff --git a/testing/mozbase/manifestparser/tests/test_manifestparser.py b/testing/mozbase/manifestparser/tests/test_manifestparser.py @@ -610,7 +610,7 @@ yellow = submarine condition = "apple_catalina" bug = "Bug 200" manifestparser.toml.add_skip_if(manifest, filename, condition, bug) - condition = "os == 'android' && android_version == '34' && debug" + condition = "os == 'android' && os_version == '14' && debug" bug = "Bug 99999" (additional_comment, carryover) = manifestparser.toml.add_skip_if( manifest, filename, condition, bug, None, True diff --git a/testing/mozbase/manifestparser/tests/test_toml.py b/testing/mozbase/manifestparser/tests/test_toml.py @@ -20,8 +20,8 @@ def carry(): [ ( 1, - "os == 'android' && android_version == '24' && processor == 'x86_64'", - "os == 'android' && android_version == '34' && processor == 'x86_64'", + "os == 'android' && processor == 'x86_64'", + "os == 'android' && os_version == '14' && processor == 'x86_64'", True, ), ( @@ -38,62 +38,62 @@ def carry(): ), ( 4, - "os == 'android' && android_version == '24' && debug", - "os == 'android' && android_version == '34' && debug", + "os == 'android' && debug", + "os == 'android' && os_version == '14' && debug", True, ), ( 5, - "os == 'android' && android_version == '24' && !debug", - "os == 'android' && android_version == '34' && debug", + "os == 'android' && !debug", + "os == 'android' && os_version == '14' && debug", False, ), ( 6, - "os == 'android' && android_version == '24' && debug", - "os == 'android' && android_version == '34' && !debug", + "os == 'android' && debug", + "os == 'android' && os_version == '14' && !debug", False, ), ( 7, - "os == 'android' && android_version == '24'", - "os == 'android' && android_version == '34' && debug", + "os == 'android'", + "os == 'android' && os_version == '14' && debug", True, ), ( 8, - "os == 'android' && android_version == '24'", - "os == 'android' && android_version == '34' && !debug", + "os == 'android'", + "os == 'android' && os_version == '14' && !debug", True, ), ( 9, - "os == 'android' && android_version == '24' && debug", - "os == 'android' && android_version == '34'", + "os == 'android' && debug", + "os == 'android' && os_version == '14'", False, ), ( 10, - "os == 'android' && android_version == '24' && !debug", - "os == 'android' && android_version == '34'", + "os == 'android' && !debug", + "os == 'android' && os_version == '14'", False, ), ( 11, - "os == 'android' && android_version == '24' && asan", - "os == 'android' && android_version == '34' && ccov", + "os == 'android' && asan", + "os == 'android' && os_version == '14' && ccov", True, ), ( 12, - "os == 'android' && android_version == '24'", - "os == 'android' && android_version == '34' && ccov", + "os == 'android'", + "os == 'android' && os_version == '14' && ccov", True, ), ( 13, - "os == 'android' && android_version == '24' && tsan", - "os == 'android' && android_version == '34'", + "os == 'android' && tsan", + "os == 'android' && os_version == '14'", False, ), ( @@ -119,14 +119,14 @@ def carry(): ), ( 20, - "os == 'android' && android_version == '24' && opt", - "os == 'android' && android_version == '34' && !debug", + "os == 'android' && opt", + "os == 'android' && os_version == '14' && !debug", True, ), ( 21, - "os == 'android' && android_version == '24' && !debug", - "os == 'android' && android_version == '34' && opt", + "os == 'android' && !debug", + "os == 'android' && os_version == '14' && opt", True, ), ( diff --git a/testing/mozbase/mozinfo/mozinfo/mozinfo.py b/testing/mozbase/mozinfo/mozinfo/mozinfo.py @@ -46,7 +46,6 @@ info = { "bits": unknown, "has_sandbox": unknown, "display": None, - "android_version": "", "automation": bool(os.environ.get("MOZ_AUTOMATION", False)), } (system, node, release, version, machine, processor) = platform.uname() diff --git a/testing/mozbase/mozinfo/mozinfo/platforminfo.py b/testing/mozbase/mozinfo/mozinfo/platforminfo.py @@ -11,29 +11,58 @@ import yaml DictAny = Dict[str, Any] DictStr = Dict[str, str] -OptTestSettings = Optional[Dict[str, Any]] +OptTestSettings = Optional[DictAny] + +# From https://developer.android.com/tools/releases/platforms +# https://apilevels.com/ +# https://en.wikipedia.org/wiki/Android_version_history +# testing/mozbase/mozdevice/mozdevice/version_codes.py +# MUST be a 1-1 map +android_os_to_api_map = { + "7.0": "24", + "7.1": "25", + "8.0": "26", + "8.1": "27", + "9.0": "28", + "10.0": "29", + "11.0": "30", + "12.0": "31", + "12.1": "32", + "13": "33", + "14": "34", + "15": "35", + "16": "36", +} + + +def android_os_to_api_version(os_version: str): + api_version = android_os_to_api_map.get(os_version) + if api_version is None: + raise Exception( + f"Unknown Android OS version '{os_version}'. Supported versions are {(android_os_to_api_map.keys())}." + ) + return api_version + + +def android_api_to_os_version(api_version: str): + if not isinstance(api_version, str): + api_version = str(api_version) + os_version = None + for k in android_os_to_api_map.keys(): + if android_os_to_api_map[k] == api_version: + os_version = k + break + if os_version is None: + raise Exception( + f"Unknown Android API version '{api_version}'. Supported versions are {android_os_to_api_map.values()}." + ) + return os_version class PlatformInfo: variant_data = {} - # From https://developer.android.com/tools/releases/platforms - android_os_to_sdk_map = { - "7.0": "24", - "7.1": "25", - "8.0": "26", - "8.1": "27", - "9.0": "28", - "10.0": "29", - "11.0": "30", - "12.0": "31", - "12L": "32", - "13.0": "33", - "14": "34", - "14.0": "34", - } - buildmap = { "debug-isolated-process": "isolated_process", } @@ -78,28 +107,28 @@ class PlatformInfo: return pretty def _clean_os_version(self) -> str: - cleaned_name = self.os version = self._platform_os["version"] if version is None: raise Exception("Could not find platform version") - if cleaned_name in ["mac", "linux"]: + if self.os in ["mac", "linux"]: # Hack for macosx 11.20 reported as 11.00 - if cleaned_name == "mac" and version == "1100": + if self.os == "mac" and version == "1100": return "11.20" if len(version) == 5 and version[2] == ".": return version # already has a dot return version[0:2] + "." + version[2:4] - if cleaned_name == "android": - android_version = self.android_os_to_sdk_map.get(version) + if self.os == "android": + if version not in android_os_to_api_map and version.endswith(".0"): + version = version[:-2] + android_version = android_os_to_api_map.get(version) if android_version is None: raise Exception( - f"Unknown android OS version {version}. Supported versions are {list(self.android_os_to_sdk_map.keys())}." + f"Unknown android OS version {version}. Supported versions are {list(android_os_to_api_map.keys())}." ) - return android_version build = self.build - if build is not None and cleaned_name == "win": + if build is not None and self.os == "win": if build == "24h2": version += ".26100" else: diff --git a/testing/mozbase/mozinfo/tests/test_platforminfo.py b/testing/mozbase/mozinfo/tests/test_platforminfo.py @@ -71,7 +71,7 @@ def test_os_version(): test_settings["platform"]["os"]["name"] = "android" test_settings["platform"]["os"]["version"] = "14.0" platform_info = PlatformInfo(test_settings) - assert platform_info.os_version == "34" + assert platform_info.os_version == "14" # Windows version stays as is test_settings["platform"]["os"]["name"] = "windows" diff --git a/testing/mozharness/configs/android/android-aarch64-profile-generation.py b/testing/mozharness/configs/android/android-aarch64-profile-generation.py @@ -41,5 +41,6 @@ config = { }, "bogomips_minimum": 3000, "android_version": 34, + "os_version": "14", "is_emulator": True, } diff --git a/testing/mozharness/configs/android/android-arm-profile-generation.py b/testing/mozharness/configs/android/android-arm-profile-generation.py @@ -41,5 +41,6 @@ config = { }, "bogomips_minimum": 3000, "android_version": 30, + "os_version": "11.0", "is_emulator": True, } diff --git a/testing/mozharness/configs/android/android-x86_64-profile-generation.py b/testing/mozharness/configs/android/android-x86_64-profile-generation.py @@ -41,5 +41,6 @@ config = { }, "bogomips_minimum": 3000, "android_version": 34, + "os_version": "14", "is_emulator": True, } diff --git a/testing/mozharness/configs/android/android-x86_64.py b/testing/mozharness/configs/android/android-x86_64.py @@ -42,5 +42,6 @@ config = { "bogomips_minimum": 3000, # in support of test-verify "android_version": 24, + "os_version": "7.0", "is_emulator": True, } diff --git a/testing/mozharness/configs/android/android14-x86_64.py b/testing/mozharness/configs/android/android14-x86_64.py @@ -42,5 +42,6 @@ config = { "bogomips_minimum": 3000, # in support of test-verify "android_version": 34, + "os_version": "14", "is_emulator": True, } diff --git a/testing/skipfails.py b/testing/skipfails.py @@ -1609,11 +1609,9 @@ class Skipfails: if os is not None: if kind == Kind.LIST: skip_if = self._get_list_skip_if(extra) - elif os_version is not None: + else: skip_if = "os" + eq + qq + os + qq - if os == "android": - skip_if += aa + "android_version" + eq + qq + os_version + qq - else: + if os_version is not None: skip_if += aa + "os_version" + eq + qq + os_version + qq arch = extra.arch if arch is not None and skip_if is not None and kind != Kind.LIST: diff --git a/testing/web-platform/meta/svg/text/scripted/getsubstringlength-emoji-ligatures.html.ini b/testing/web-platform/meta/svg/text/scripted/getsubstringlength-emoji-ligatures.html.ini @@ -1,5 +1,2 @@ [getsubstringlength-emoji-ligatures.html] [SVGTextContentElement.getSubStringLength on Emoji with ligatures] - expected: - if release_or_beta and (os == "android") and (android_version == "24"): FAIL - diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py @@ -21,6 +21,7 @@ import mozfile import mozinfo import runxpcshelltests as xpcshell from mozdevice import ADBDevice, ADBDeviceFactory, ADBTimeoutError +from mozinfo.platforminfo import android_api_to_os_version from mozlog import commandline from xpcshellcommandline import parser_remote @@ -398,9 +399,14 @@ class XPCShellRemote(xpcshell.XPCShellTests): ) self.remoteTestRoot = posixpath.join(self.device.test_root, "xpc") self.remoteLogFolder = posixpath.join(self.remoteTestRoot, "logs") - # Add Android version (SDK level) to mozinfo so that manifest entries - # can be conditional on android_version. - mozinfo.info["android_version"] = str(self.device.version) + # Use Android version (SDK level) to get os_version for mozinfo + # so that manifest entries can be conditional on os_version. + android_version = str(self.device.version) + os_version = android_api_to_os_version(android_version) + self.log.info( + f"Android sdk version '{android_version}' corresponds to os_version '{os_version}'; use os_version to filter manifests" + ) + mozinfo.info["os_version"] = os_version mozinfo.info["is_emulator"] = self.device._device_serial.startswith("emulator-") self.localBin = options["localBin"] diff --git a/widget/tests/mochitest.toml b/widget/tests/mochitest.toml @@ -11,7 +11,6 @@ skip-if = ["headless"] # bug 1410525 ["test_assign_event_data.html"] skip-if = [ "os == 'mac'", # bug 933303 - "android_version == '24'", "headless && os == 'win'", ] @@ -33,16 +32,16 @@ support-files = ["file_test_clipboard_asyncSetData.js"] support-files = ["file_test_clipboard_getDataSnapshot.js"] skip-if = [ "os == 'linux' && os_version == '22.04' && display == 'wayland'", # Bug 1879835 - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug", # Bug 1982951 - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt", # Bug 1982951 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug", # Bug 1982951 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt", # Bug 1982951 ] ["test_clipboard_getDataSnapshotSync.html"] support-files = "file_test_clipboard_getDataSnapshotSync.js" skip-if = [ "os == 'linux' && os_version == '22.04' && display == 'wayland'", # Bug 1879835 - "os == 'android' && android_version == '34' && processor == 'x86_64' && debug", # Bug 1982951 - "os == 'android' && android_version == '34' && processor == 'x86_64' && opt", # Bug 1982951 + "os == 'android' && os_version == '14' && processor == 'x86_64' && debug", # Bug 1982951 + "os == 'android' && os_version == '14' && processor == 'x86_64' && opt", # Bug 1982951 ] ["test_clipboard_pngPreservesTransparency.html"] diff --git a/xpcom/tests/unit/xpcshell.toml b/xpcom/tests/unit/xpcshell.toml @@ -105,7 +105,6 @@ skip-if = ["os == 'android'"] # Creating a symlink requires admin or developer mode on Windows. skip-if = ["os == 'win'"] # Bug 676998: test fails consistently on Android -fail-if = ["os == 'android' && android_version == '24'"] ["test_systemInfo.js"]