diff options
Diffstat (limited to 'testing/web-platform/meta/mixed-content/tentative')
4 files changed, 19 insertions, 29 deletions
diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini index ce286d5bd9..0d87bdc5bd 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini @@ -2,21 +2,21 @@ disabled: if (os == "android") and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1401570 expected: - if (os == "linux") and asan and not fission: [TIMEOUT, OK] + if (os == "linux") and (processor == "x86_64") and debug and fission: [TIMEOUT, OK] + if (os == "linux") and (processor == "x86"): [TIMEOUT, OK] if os == "mac": OK if os == "android": [OK, ERROR, TIMEOUT] [OK, TIMEOUT] [Audio autoupgraded] expected: - if (os == "linux") and fission and not debug and (processor == "x86_64") and not asan and not tsan: [PASS, TIMEOUT] - if (os == "linux") and not fission: [PASS, TIMEOUT] - if os == "win": [PASS, TIMEOUT] - if os == "android": [PASS, TIMEOUT] + if (os == "linux") and (processor == "x86_64") and fission and not debug and tsan: PASS + if (os == "linux") and (processor == "x86_64") and fission and debug: PASS + if (os == "linux") and (processor == "x86"): TIMEOUT + if os == "mac": PASS + [PASS, TIMEOUT] [Audio of other host autoupgraded] expected: - if (os == "linux") and asan and not fission: [TIMEOUT, PASS] - if (os == "win") and not swgl: PASS - if os == "mac": PASS - if os == "android": PASS - [PASS, TIMEOUT] + if (os == "linux") and debug and fission: [TIMEOUT, PASS] + if (os == "linux") and debug and not fission: [PASS, TIMEOUT] + if (os == "linux") and not debug: [PASS, TIMEOUT] diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini index c87e42f6f6..6abe67fde9 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/image-upgrade.https.sub.html.ini @@ -1,4 +1,4 @@ [image-upgrade.https.sub.html] expected: - if (os == "android") and debug and swgl: [OK, ERROR] - if (os == "android") and debug and not swgl: [OK, ERROR] + if (os == "android") and debug: [OK, ERROR] + if (os == "android") and not debug: [OK, CRASH] 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 7133fe01c5..8748b3fc92 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,19 +1,14 @@ [mixed-content-cors.https.sub.html] expected: - 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] + if (os == "linux") and debug: [OK, TIMEOUT] + if (os == "linux") and not debug: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, ERROR, TIMEOUT] [Cross-Origin audio should get upgraded even if CORS is set] expected: - 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 == "linux") and debug: [PASS, TIMEOUT] + if (os == "linux") and not debug: [PASS, TIMEOUT] if (os == "android") and not debug: [PASS, TIMEOUT] [Cross-Origin video should get upgraded even if CORS is set] expected: - if (os == "linux") and swgl and fission: [PASS, TIMEOUT] if (os == "android") and not debug: [PASS, TIMEOUT] diff --git a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini index 35506023bb..a42e327322 100644 --- a/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini +++ b/testing/web-platform/meta/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html.ini @@ -1,9 +1,4 @@ [video-upgrade.https.sub.html] expected: - if (os == "linux") and fission and swgl: [OK, TIMEOUT] - if (os == "linux") and not fission and not debug: [OK, TIMEOUT] - if (os == "android") and debug and not swgl: [OK, ERROR] - [Video autoupgraded] - expected: - if fission and swgl and (os == "linux"): [PASS, TIMEOUT] - if not fission and (os == "linux") and not debug: [PASS, TIMEOUT] + if (os == "android") and debug: [OK, ERROR] + if (os == "android") and not debug: [OK, ERROR] |