diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /testing/web-platform/meta/mixed-content | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/meta/mixed-content')
| -rw-r--r-- | testing/web-platform/meta/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html.ini | 17 |
1 files changed, 12 insertions, 5 deletions
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: |