From 84ec035b90e769574bd1bdb7a5dc3eeef57b252c Mon Sep 17 00:00:00 2001 From: Edwin Gao Date: Wed, 6 Mar 2019 19:48:30 +0000 Subject: [PATCH] Bug 1525435 - insert expected outcomes for encrypted-media tests in wpt for windows10-aarch64 r=jmaher,gbrown Changes: Added expected outcomes to the following files. ``` - drm-check-encryption-scheme.https.html.ini - drm-check-status-for-hdcp.https.html.ini - drm-mp4-playback-temporary-playduration-keystatus.html.ini - drm-mp4-playback-temporary-playduration.html.ini ``` Differential Revision: https://phabricator.services.mozilla.com/D21585 --HG-- extra : moz-landing-system : lando --- ...drm-check-encryption-scheme.https.html.ini | 3 +++ .../drm-check-status-for-hdcp.https.html.ini | 25 +++++++++++-------- ...-temporary-playduration-keystatus.html.ini | 5 +++- ...4-playback-temporary-playduration.html.ini | 4 +++ 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/testing/web-platform/meta/encrypted-media/drm-check-encryption-scheme.https.html.ini b/testing/web-platform/meta/encrypted-media/drm-check-encryption-scheme.https.html.ini index 772f82a6034c..4ea4730646ec 100644 --- a/testing/web-platform/meta/encrypted-media/drm-check-encryption-scheme.https.html.ini +++ b/testing/web-platform/meta/encrypted-media/drm-check-encryption-scheme.https.html.ini @@ -1,16 +1,19 @@ [drm-check-encryption-scheme.https.html] expected: + if (os == "win" and processor == "aarch64"): OK if (os == "linux"): TIMEOUT if (os == "mac"): TIMEOUT if (os == "win"): TIMEOUT [drm support for "cenc" encryption scheme.] expected: + if (os == "win" and processor == "aarch64"): PASS if (os == "win"): TIMEOUT if (os == "linux"): TIMEOUT if (os == "mac"): TIMEOUT [drm support for "cbcs" encryption scheme.] expected: + if (os == "win" and processor == "aarch64"): PASS if (os == "linux"): NOTRUN if (os == "win"): NOTRUN if (os == "mac"): NOTRUN diff --git a/testing/web-platform/meta/encrypted-media/drm-check-status-for-hdcp.https.html.ini b/testing/web-platform/meta/encrypted-media/drm-check-status-for-hdcp.https.html.ini index 3fe9b2ed31c4..259d78449b95 100644 --- a/testing/web-platform/meta/encrypted-media/drm-check-status-for-hdcp.https.html.ini +++ b/testing/web-platform/meta/encrypted-media/drm-check-status-for-hdcp.https.html.ini @@ -1,19 +1,22 @@ [drm-check-status-for-hdcp.https.html] expected: - if (os == "linux"): "TIMEOUT" - if (os == "mac"): "TIMEOUT" - if (os == "win"): "TIMEOUT" + if (os == "win" and processor == "aarch64"): OK + if (os == "linux"): TIMEOUT + if (os == "mac"): TIMEOUT + if (os == "win"): TIMEOUT [drm support for HDCP 1.0.] expected: - if (os == "win"): "NOTRUN" - if (os == "linux"): "NOTRUN" - if (os == "mac"): "NOTRUN" - if (os == "android"): "FAIL" + if (os == "win" and processor == "aarch64"): FAIL + if (os == "win"): NOTRUN + if (os == "linux"): NOTRUN + if (os == "mac"): NOTRUN + if (os == "android"): FAIL [drm support for empty HDCP version.] expected: - if (os == "linux"): "TIMEOUT" - if (os == "win"): "TIMEOUT" - if (os == "android"): "FAIL" - if (os == "mac"): "TIMEOUT" + if (os == "win" and processor == "aarch64"): FAIL + if (os == "linux"): TIMEOUT + if (os == "win"): TIMEOUT + if (os == "android"): FAIL + if (os == "mac"): TIMEOUT diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html.ini index 87c4a66058ec..55d1f941f45a 100644 --- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html.ini +++ b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration-keystatus.html.ini @@ -1,9 +1,12 @@ [drm-mp4-playback-temporary-playduration-keystatus.html] + disabled: + if (os == "win" and processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1525435 expected: if (os == "android"): OK TIMEOUT [drm, temporary, mp4, playback with limited playduration, check keystatus, single key] + disabled: + if (os == "win" and processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1525435 expected: if (os == "android"): FAIL TIMEOUT - diff --git a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration.html.ini b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration.html.ini index c0af6a741708..33a700e7907b 100644 --- a/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration.html.ini +++ b/testing/web-platform/meta/encrypted-media/drm-mp4-playback-temporary-playduration.html.ini @@ -1,8 +1,12 @@ [drm-mp4-playback-temporary-playduration.html] + disabled: + if (os == "win" and processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1525435 expected: if (os == "android"): OK TIMEOUT [drm, temporary, mp4, playback with limited playduration, single key] + disabled: + if (os == "win" and processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1525435 expected: if (os == "android"): FAIL TIMEOUT