From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../urls/resolving-urls/query-encoding/utf-16le.html.ini | 4 ++++ .../urls/resolving-urls/query-encoding/utf-8.html.ini | 2 ++ .../urls/resolving-urls/query-encoding/windows-1251.html.ini | 11 +++-------- .../urls/resolving-urls/query-encoding/windows-1252.html.ini | 8 ++------ 4 files changed, 11 insertions(+), 14 deletions(-) (limited to 'testing/web-platform/meta/html/infrastructure/urls') diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini index 11b3ac00f1..831e6a92fb 100644 --- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini +++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini @@ -34,12 +34,16 @@ [utf-16le.html?include=svg] [utf-16le.html?include=window-open] + expected: + if (os == "android") and not debug: [OK, CRASH] [utf-16le.html?include=xml] [utf-16le.html?include=base-href] [utf-16le.html?include=css] + expected: + if (os == "android") and not debug: [OK, CRASH] [utf-16le.html?include=workers] expected: [OK, TIMEOUT] diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini index 81957a30b3..02b4ab375c 100644 --- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini +++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini @@ -47,6 +47,8 @@ [utf-8.html?include=svg] [utf-8.html?include=history] + expected: + if (os == "android") and not debug: [OK, CRASH] [utf-8.html?include=nested-browsing] diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini index 7069071b92..e35141fab0 100644 --- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini +++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini @@ -233,12 +233,6 @@ [windows-1251.html?include=eventsource] - [EventSource constructor] - expected: FAIL - - [EventSource#url] - expected: FAIL - [windows-1251.html?include=websocket] @@ -269,6 +263,8 @@ [windows-1251.html?include=base-href] [windows-1251.html?include=xhr] + expected: + if (os == "android") and not debug: [OK, CRASH] [windows-1251.html?include=workers] expected: [OK, TIMEOUT] @@ -304,5 +300,4 @@ [windows-1251.html?include=loading] expected: - if not fission and (os == "linux") and debug: [OK, ERROR] - if not fission and (os == "linux") and not debug: [OK, ERROR, CRASH] + if (os == "linux") and not fission: [OK, ERROR] diff --git a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini index b00ed5fdf7..fb1ac3fee6 100644 --- a/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini +++ b/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini @@ -95,12 +95,6 @@ [windows-1252.html?include=eventsource] - [EventSource constructor] - expected: FAIL - - [EventSource#url] - expected: FAIL - [windows-1252.html?include=css] @@ -122,3 +116,5 @@ [windows-1252.html?include=websocket] [windows-1252.html?include=history] + expected: + if (os == "android") and not debug: [OK, CRASH] -- cgit v1.2.3