Log Message
Make GL error messages consistent in LayoutTests https://bugs.webkit.org/show_bug.cgi?id=89689
Patch by Gregg Tavares <[email protected]> on 2012-06-21 Reviewed by Kenneth Russell. * fast/canvas/webgl/resources/webgl-test.js: (shouldGenerateGLError): (glErrorShouldBe): * fast/canvas/webgl/webgl-depth-texture-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (120989 => 120990)
--- trunk/LayoutTests/ChangeLog 2012-06-22 01:33:30 UTC (rev 120989)
+++ trunk/LayoutTests/ChangeLog 2012-06-22 01:46:12 UTC (rev 120990)
@@ -1,3 +1,15 @@
+2012-06-21 Gregg Tavares <[email protected]>
+
+ Make GL error messages consistent in LayoutTests
+ https://bugs.webkit.org/show_bug.cgi?id=89689
+
+ Reviewed by Kenneth Russell.
+
+ * fast/canvas/webgl/resources/webgl-test.js:
+ (shouldGenerateGLError):
+ (glErrorShouldBe):
+ * fast/canvas/webgl/webgl-depth-texture-expected.txt:
+
2012-06-21 Kenneth Russell <[email protected]>
[chromium] Layout Test fast/speech/scripted/speechgrammar-basics.html is flaky
Modified: trunk/LayoutTests/fast/canvas/webgl/resources/webgl-test.js (120989 => 120990)
--- trunk/LayoutTests/fast/canvas/webgl/resources/webgl-test.js 2012-06-22 01:33:30 UTC (rev 120989)
+++ trunk/LayoutTests/fast/canvas/webgl/resources/webgl-test.js 2012-06-22 01:46:12 UTC (rev 120990)
@@ -138,14 +138,17 @@
testFailed(evalStr + " threw exception " + exception);
} else {
var err = ctx.getError();
+ var errStrs = [];
+ for (var ii = 0; ii < glErrors.length; ++ii) {
+ errStrs.push(getGLErrorAsString(ctx, glErrors[ii]));
+ }
+ var expected = errStrs.join(" or ");
if (glErrors.indexOf(err) < 0) {
- var errStrs = [];
- for (var ii = 0; ii < glErrors.length; ++ii) {
- errStrs.push(getGLErrorAsString(ctx, glErrors[ii]));
- }
- testFailed(evalStr + " expected: " + errStrs.join(" or ") + ". Was " + getGLErrorAsString(ctx, err) + ".");
+ testFailed(evalStr + " expected: " + expected + ". Was " + getGLErrorAsString(ctx, err) + ".");
} else {
- testPassed(evalStr + " generated expected GL error: " + getGLErrorAsString(ctx, err) + ".");
+ var msg = (glErrors.length == 1) ? " generated expected GL error: " :
+ " generated one of expected GL errors: ";
+ testPassed(evalStr + msg + expected + ".");
}
}
}
@@ -165,21 +168,17 @@
opt_msg = opt_msg || "";
var err = gl.getError();
var ndx = glErrors.indexOf(err);
+ var errStrs = [];
+ for (var ii = 0; ii < glErrors.length; ++ii) {
+ errStrs.push(getGLErrorAsString(gl, glErrors[ii]));
+ }
+ var expected = errStrs.join(" or ");
if (ndx < 0) {
- if (glErrors.length == 1) {
- testFailed("getError expected: " + getGLErrorAsString(gl, glErrors[0]) +
- ". Was " + getGLErrorAsString(gl, err) + " : " + opt_msg);
- } else {
- var errs = [];
- for (var ii = 0; ii < glErrors.length; ++ii) {
- errs.push(getGLErrorAsString(gl, glErrors[ii]));
- }
- testFailed("getError expected one of: [" + errs.join(", ") +
- "]. Was " + getGLErrorAsString(gl, err) + " : " + opt_msg);
- }
+ var msg = "getError expected" + ((glErrors.length > 1) ? " one of: " : ": ");
+ testFailed(msg + expected + ". Was " + getGLErrorAsString(gl, err) + " : " + opt_msg);
} else {
- testPassed("getError was expected value: " +
- getGLErrorAsString(gl, err) + " : " + opt_msg);
+ var msg = "getError was " + ((glErrors.length > 1) ? "one of: " : "expected value: ");
+ testPassed(msg + expected + " : " + opt_msg);
}
};
Modified: trunk/LayoutTests/fast/canvas/webgl/webgl-depth-texture-expected.txt (120989 => 120990)
--- trunk/LayoutTests/fast/canvas/webgl/webgl-depth-texture-expected.txt 2012-06-22 01:33:30 UTC (rev 120989)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl-depth-texture-expected.txt 2012-06-22 01:46:12 UTC (rev 120990)
@@ -20,8 +20,8 @@
PASS gl.texImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X, 1, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, null) generated expected GL error: INVALID_OPERATION.
PASS gl.texImage2D(gl.TEXTURE_2D, 1, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, null) generated expected GL error: INVALID_OPERATION.
PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, new Uint16Array(1)) generated expected GL error: INVALID_OPERATION.
-PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, canvas2) generated expected GL error: INVALID_OPERATION.
-PASS gl.copyTexImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 0, 0, 1, 1, 0) generated expected GL error: INVALID_OPERATION.
+PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, canvas2) generated one of expected GL errors: INVALID_VALUE or INVALID_ENUM or INVALID_OPERATION.
+PASS gl.copyTexImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 0, 0, 1, 1, 0) generated one of expected GL errors: INVALID_ENUM or INVALID_OPERATION.
PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 8, 8, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, null) generated expected GL error: NO_ERROR.
PASS gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 1, 1, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, new Uint16Array(1)) generated expected GL error: INVALID_OPERATION.
PASS gl.copyTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 0, 0, 1, 1) generated expected GL error: INVALID_OPERATION.
@@ -38,8 +38,8 @@
PASS gl.texImage2D(gl.TEXTURE_CUBE_MAP_NEGATIVE_X, 1, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, null) generated expected GL error: INVALID_OPERATION.
PASS gl.texImage2D(gl.TEXTURE_2D, 1, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, null) generated expected GL error: INVALID_OPERATION.
PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, new Uint32Array(1)) generated expected GL error: INVALID_OPERATION.
-PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, canvas2) generated expected GL error: INVALID_OPERATION.
-PASS gl.copyTexImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 0, 0, 1, 1, 0) generated expected GL error: INVALID_OPERATION.
+PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, canvas2) generated one of expected GL errors: INVALID_VALUE or INVALID_ENUM or INVALID_OPERATION.
+PASS gl.copyTexImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 0, 0, 1, 1, 0) generated one of expected GL errors: INVALID_ENUM or INVALID_OPERATION.
PASS gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 8, 8, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, null) generated expected GL error: NO_ERROR.
PASS gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 1, 1, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, new Uint32Array(1)) generated expected GL error: INVALID_OPERATION.
PASS gl.copyTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 0, 0, 1, 1) generated expected GL error: INVALID_OPERATION.
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
