Attachment 347239 Details for Bug 188628 – Patch

[patch] Patch

bug-188628-20180815210330.patch (text/plain), 11.63 KB, created by Justin Fan on 2018-08-15 21:03:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Fan

Created: 2018-08-15 21:03:31 PDT

Size: 11.63 KB

patch

obsolete

>Subversion Revision: 234901
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c766cb18557abb9387875bbfe5f11c8409870f20..3e764db1b565433e349f8570682254f1b1f65552 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,28 @@
>+2018-08-15  Justin Fan  <justin_fan@apple.com>
>+
>+        Update webkit-webgl-test-harness.js to provide more info on failing and partially passing tests
>+        https://bugs.webkit.org/show_bug.cgi?id=188628
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Slightly augment the test-harness for the WebGL 2 conformance suite; failing test results now report
>+        failure messagees and the number of individual reported failures and passes from the wrapped Khronos test. 
>+        Allow us to track when incremental conformance improvements or regressions occur within the breadth of a 
>+        single conformance test. 
>+
>+        * webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt:
>+        * webgl/2.0.0/resources/webkit-webgl-test-harness.js:
>+        (window.webglTestHarness.reportResults):
>+        (window.webglTestHarness.notifyFinished):
>+
> 2018-08-15  Christopher Reid  <chris.reid@sony.com>
> 
>         [Curl] Implement default cookie path handling correctly as outlined in RFC6265.
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt
>index ffea9ae1857e7feeec2cb3f730f1c8e8927f4f15..def837fdace305dcb0927b7b0cdfcf147a2ace2b 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/attrib-location-length-limits-expected.txt
>@@ -1,5 +1,10 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/attrib-location-length-limits.html
>+getError expected: NO_ERROR. Was INVALID_VALUE :
>+attrib location was -1, should not be
>+getError expected: NO_ERROR. Was INVALID_VALUE :
>+3 failures reported
>+7 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt
>index 359eb719b466ba255373468fef387bd6a2de01cd..a0962d8599ba8e42e0598c4c6a34811d628da602 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-linking-expected.txt
>@@ -1,5 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-linking.html
>+[unexpected link status] OpenGL ES Shading Language 3.00 vertex shader should not link with OpenGL ES Shading Language 1.00 fragment shader.
>+[unexpected link status] OpenGL ES Shading Language 1.00 vertex shader should not link with OpenGL ES Shading Language 3.00 fragment shader.
>+2 failures reported
>+2 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt
>index efbe81ee6439aa19165f845ad3106229f7bbe0d4..2648d2b279e9bc7665837c93fa9ee3012d45e2d6 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-define-expected.txt
>@@ -1,5 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-1024-character-define.html
>+[unexpected vertex shader compile status] (expected: true) vertex shader that uses 1024 character token in #define should succeed
>+[link failed] vertex shader that uses 1024 character token in #define should succeed
>+2 failures reported
>+1 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt
>index 58a80c8a28557051ba7322ff6a8ef8f664894c44..b4cf54661707ac9a6df7fca562250ccf75baa7aa 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-1024-character-identifier.frag-expected.txt
>@@ -1,5 +1,12 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-1024-character-identifier.frag.html
>+[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier should succeed
>+[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier that starts with underscore should succeed
>+[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier that ends with underscore should succeed
>+[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier with odd characters as underscores should succeed
>+[unexpected fragment shader compile status] (expected: true) shader with 1024 character identifier with even characters as underscores should succeed
>+5 failures reported
>+1 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt
>index f055dc7fbbd8199b1060a4ddf26b22c5c7880197..b291b4b1b12a692a1c487d3e8327880ad4ddb9b9 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-invalid-characters-expected.txt
>@@ -1,5 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-invalid-characters.html
>+[unexpected vertex shader compile status] (expected: true) vertex shader that uses backlash character in comments should succeed
>+[link failed] vertex shader that uses backlash character in comments should succeed
>+2 failures reported
>+1 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt
>index d7f18ab80db4f19d0bcea8330ef47890c0b92a9d..7b9dc544ed3aa26bb54378f04341fc71bb4153b9 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block-expected.txt
>@@ -1,5 +1,8 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/shader-with-mis-matching-uniform-block.html
>+[unexpected link status] Shaders with precision mis-matching uniform blocks should fail
>+1 failures reported
>+1 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt
>index ff4176fe0abb5ef4ac33b494ee7c9fd84de0e55c..f8ca505ec85c31f86c665069f27189163f96665a 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/unary-minus-operator-in-dynamic-loop-expected.txt
>@@ -1,5 +1,10 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html
>+square should be green at (138, 0) expected: 0,255,0,255 was 255,0,0,255
>+square should be green at (414, 0) expected: 0,255,0,255 was 255,0,0,255
>+square should be green at (690, 0) expected: 0,255,0,255 was 255,0,0,255
>+3 failures reported
>+4 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt
>index c8885e497dfcf046b850cfa9949e31397921a9d6..ea06e29d9f1230f552d78664acbbd4cdf546a6e8 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-location-length-limits-expected.txt
>@@ -1,5 +1,9 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/uniform-location-length-limits.html
>+uniformLoc should be non-null. Was null
>+getError expected: NO_ERROR. Was INVALID_VALUE :
>+2 failures reported
>+6 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt
>index a7ea065c16fedce6c17ee8d77d103825aa6a386b..a1cf1e485301335fbd74501614dde8a6fc3fc2b5 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/valid-invariant-expected.txt
>@@ -1,5 +1,10 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/valid-invariant.html
>+[unexpected link status] vertex shader with invariant varying and fragment shader with variant varying must succeed
>+[unexpected link status] vertex shader with invariant (global setting) varying and fragment shader with variant varying must succeed
>+[unexpected link status] vertex shader with invariant (separately set) varying and fragment shader with variant varying must succeed
>+3 failures reported
>+1 passes reported
> FAIL
> 
>diff --git a/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js b/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js
>index b766c8a8c74e734304ed10a4dfe4f93c93cd9ba0..714a06acd11994c90dfdc5bc5e6a1fb4cb6f20bb 100644
>--- a/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js
>+++ b/LayoutTests/webgl/2.0.0/resources/webkit-webgl-test-harness.js
>@@ -1,5 +1,6 @@
> "use strict";
> (function() {
>+  var numSuccesses = 0;
>   var numFailures = 0;
> 
>   if (window.testRunner && !window.layoutTestController) {
>@@ -32,7 +33,10 @@
> 
>   window.webglTestHarness = {
>     reportResults: function(url, success, msg) {
>-      if (!success) {
>+      if (success) {
>+        ++numSuccesses;
>+      } else {
>+        log(msg, "red");
>         ++numFailures;
>       }
>     },
>@@ -40,6 +44,10 @@
>     notifyFinished: function(url) {
>       var iframe = document.getElementById("iframe");
>       if (numFailures > 0) {
>+        if (numSuccesses > 0) {
>+          log(numFailures + " failures reported", "red");
>+          log(numSuccesses + " passes reported", "green");
>+        }
>         log("FAIL", "red");
>       } else {
>         log("PASS", "green");

Actions: View | Formatted Diff | Diff

Attachments on bug 188628: 347239