Title: [122281] trunk/LayoutTests
- Revision
- 122281
- Author
- [email protected]
- Date
- 2012-07-10 17:18:35 -0700 (Tue, 10 Jul 2012)
Log Message
Line directive test in fast/canvas/webgl/glsl-conformance.html is incorrect
https://bugs.webkit.org/show_bug.cgi?id=90897
Reviewed by Adrienne Walker.
Removed an invalid test and adjusted the test expectations.
* fast/canvas/webgl/glsl-conformance-expected.txt:
* fast/canvas/webgl/glsl-conformance.html:
* platform/chromium/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (122280 => 122281)
--- trunk/LayoutTests/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
+++ trunk/LayoutTests/ChangeLog 2012-07-11 00:18:35 UTC (rev 122281)
@@ -1,3 +1,16 @@
+2012-07-10 Kenneth Russell <[email protected]>
+
+ Line directive test in fast/canvas/webgl/glsl-conformance.html is incorrect
+ https://bugs.webkit.org/show_bug.cgi?id=90897
+
+ Reviewed by Adrienne Walker.
+
+ Removed an invalid test and adjusted the test expectations.
+
+ * fast/canvas/webgl/glsl-conformance-expected.txt:
+ * fast/canvas/webgl/glsl-conformance.html:
+ * platform/chromium/TestExpectations:
+
2012-07-10 Philip Rogers <[email protected]>
Crash due to SVG animation element not removed from target (before reset)
Modified: trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt (122280 => 122281)
--- trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt 2012-07-10 23:53:21 UTC (rev 122280)
+++ trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt 2012-07-11 00:18:35 UTC (rev 122281)
@@ -28,7 +28,6 @@
PASS [vshaderWithVersion130/fshader]: vertex shader uses the #version not 100 directive should fail
PASS [vshaderWithVersion120/fshader]: vertex shader uses the #version not 100 directive should fail
PASS [vshaderWithVersion100/fshader]: vertex shader uses the #version 100 directive should succeed
-PASS [vshaderWithLineDirective/fshader]: vertex shader uses #line directive should report correct line
PASS [shaders/implicit/add_int_float.vert/fshader]: implicit cast adding integer to float should fail
PASS [shaders/implicit/add_int_mat2.vert/fshader]: implicit cast adding integer to mat2 should fail
PASS [shaders/implicit/add_int_mat3.vert/fshader]: implicit cast adding integer to mat3 should fail
Modified: trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html (122280 => 122281)
--- trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html 2012-07-10 23:53:21 UTC (rev 122280)
+++ trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html 2012-07-11 00:18:35 UTC (rev 122281)
@@ -211,10 +211,6 @@
gl_Position = vPosition;
}
</script>
-<script id="vshaderWithLineDirective" type="text/something-not-_javascript_">
-#line 123
-foo
-</script>
<script id="vshaderWith__FILE__" type="text/something-not-_javascript_">
__FILE__
</script>
@@ -404,14 +400,6 @@
linkSuccess: true,
passMsg: 'vertex shader uses the #version 100 directive should succeed',
},
- { vShaderId: 'vshaderWithLineDirective',
- vShaderSuccess: false,
- vShaderTest: (function() { return wtu.getLastError().indexOf("124") >= 0; }),
- fShaderId: 'fshader',
- fShaderSuccess: true,
- linkSuccess: false,
- passMsg: 'vertex shader uses #line directive should report correct line',
- }
];
// Read in all the shader source.
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (122280 => 122281)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-10 23:53:21 UTC (rev 122280)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-11 00:18:35 UTC (rev 122281)
@@ -3749,9 +3749,6 @@
// Flaky
BUGWK90746 : fast/multicol/column-span-parent-continuation-crash.html = PASS TIMEOUT
-BUGCR136441 : fast/canvas/webgl/glsl-conformance.html = TEXT
-BUGCR136441 : platform/chromium/virtual/gpu/fast/canvas/webgl/glsl-conformance.html = TEXT
-
// Flaky
BUGWK90896 WIN DEBUG : fast/js/dfg-cross-global-object-inline-new-array-literal.html = PASS TEXT
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
