From 0c87590071d72f5722f1869e132cce3956c18faf Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 29 Apr 2020 14:30:12 -0400 Subject: [PATCH] Update test results for macOS. --- components/compositing/.#compositor.rs | 1 - .../misc/tex-image-with-bad-args-from-dom-elements.html.ini | 4 +++- .../misc/tex-image-with-different-data-source.html.ini | 4 +++- .../meta/conformance2/textures/misc/tex-srgb-mipmap.html.ini | 3 +++ .../meta/conformance2/textures/misc/tex-storage-2d.html.ini | 2 +- ...x-unpack-params-with-flip-y-and-premultiply-alpha.html.ini | 4 +++- 6 files changed, 13 insertions(+), 5 deletions(-) delete mode 120000 components/compositing/.#compositor.rs create mode 100644 tests/wpt/webgl/meta/conformance2/textures/misc/tex-srgb-mipmap.html.ini diff --git a/components/compositing/.#compositor.rs b/components/compositing/.#compositor.rs deleted file mode 120000 index 063c4ebfa1a..00000000000 --- a/components/compositing/.#compositor.rs +++ /dev/null @@ -1 +0,0 @@ -joshmatthews@joshmatthews-fcmd6r.1071 \ No newline at end of file diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini index abc1406367e..c3ea537d8ba 100644 --- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini +++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini @@ -1,2 +1,4 @@ [tex-image-with-bad-args-from-dom-elements.html] - expected: CRASH + expected: + if os == "mac": TIMEOUT + if os == "linux": CRASH diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini index 1565d7b1a3b..76c0beb6d30 100644 --- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini +++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini @@ -1,2 +1,4 @@ [tex-image-with-different-data-source.html] - expected: CRASH + expected: + if os == "mac": TIMEOUT + if os == "linux": CRASH diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-srgb-mipmap.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-srgb-mipmap.html.ini new file mode 100644 index 00000000000..38c8ba8e8ac --- /dev/null +++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-srgb-mipmap.html.ini @@ -0,0 +1,3 @@ +[tex-srgb-mipmap.html] + disabled: + if os == "mac": srgb pixel results aren't good on macos diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-storage-2d.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-storage-2d.html.ini index fd651a0864f..2061a1f7336 100644 --- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-storage-2d.html.ini +++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-storage-2d.html.ini @@ -1,5 +1,5 @@ [tex-storage-2d.html] - disable: until texture initialization is implemented + disabled: until texture initialization is implemented [WebGL test #32: texture should sample as uninitialized texture after texStorage2D\nat (0, 0) expected: 0,0,0,255 was 255,84,64,255] expected: FAIL diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini index 314420504f3..cba13478f8f 100644 --- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini +++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini @@ -1,2 +1,4 @@ [tex-unpack-params-with-flip-y-and-premultiply-alpha.html] - expected: CRASH + expected: + if os == "mac": TIMEOUT + if os == "linux": CRASH