From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../autoupgrades/mixed-content-cors.https.sub.html.ini | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'testing/web-platform/meta/mixed-content/tentative/autoupgrades') diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini index 77dc314932..7133fe01c5 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini @@ -1,21 +1,19 @@ [mixed-content-cors.https.sub.html] expected: - if (os == "linux") and not asan and not swgl and not debug and fission and not tsan: [OK, TIMEOUT] - if (os == "linux") and not asan and not swgl and not debug and not fission: [TIMEOUT, OK] - if (os == "linux") and asan and fission: TIMEOUT - if (os == "linux") and asan and not fission: [OK, TIMEOUT] - if (os == "linux") and not asan and swgl: [OK, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and not tsan and debug and swgl: [OK, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and not tsan and not debug: [OK, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and tsan: TIMEOUT + if (os == "linux") and (processor == "x86"): [TIMEOUT, OK] if (os == "android") and not debug: [OK, TIMEOUT] [Cross-Origin audio should get upgraded even if CORS is set] expected: - if (os == "linux") and not swgl and not debug and fission and not asan and not tsan: [PASS, TIMEOUT] - if (os == "linux") and not swgl and not debug and not fission and asan: [PASS, TIMEOUT] - if (os == "linux") and not swgl and not debug and not fission and not asan: [TIMEOUT, PASS] - if (os == "linux") and swgl: [PASS, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and not tsan and debug and swgl: [PASS, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and not tsan and not debug: [PASS, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and tsan: TIMEOUT + if (os == "linux") and (processor == "x86"): [TIMEOUT, PASS] if (os == "android") and not debug: [PASS, TIMEOUT] [Cross-Origin video should get upgraded even if CORS is set] expected: - if (os == "linux") and not swgl and asan and fission: TIMEOUT if (os == "linux") and swgl and fission: [PASS, TIMEOUT] if (os == "android") and not debug: [PASS, TIMEOUT] -- cgit v1.2.3