From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- .../autoupgrades/mixed-content-cors.https.sub.html.ini | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'testing/web-platform/meta/mixed-content') 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 8748b3fc92..b7ef3f0663 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,13 +1,20 @@ [mixed-content-cors.https.sub.html] expected: - if (os == "linux") and debug: [OK, TIMEOUT] - if (os == "linux") and not debug: [OK, TIMEOUT] + if (os == "linux") and not debug and not asan and not tsan: [TIMEOUT, OK] + if (os == "win") and debug and (processor == "x86_64"): TIMEOUT + if (os == "win") and debug and (processor == "x86"): OK + if (os == "win") and not debug: OK + if (os == "android") and debug: OK if (os == "android") and not debug: [OK, ERROR, TIMEOUT] + [OK, TIMEOUT] [Cross-Origin audio should get upgraded even if CORS is set] expected: - if (os == "linux") and debug: [PASS, TIMEOUT] - if (os == "linux") and not debug: [PASS, TIMEOUT] - if (os == "android") and not debug: [PASS, TIMEOUT] + if (os == "linux") and not debug and not asan and not tsan: [TIMEOUT, PASS] + if (os == "win") and debug and (processor == "x86_64"): TIMEOUT + if (os == "win") and debug and (processor == "x86"): PASS + if (os == "win") and not debug: PASS + if (os == "android") and debug: PASS + [PASS, TIMEOUT] [Cross-Origin video should get upgraded even if CORS is set] expected: -- cgit v1.2.3