diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /testing/web-platform/meta/mixed-content | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
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 | 18 |
1 files changed, 8 insertions, 10 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 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] |