mirror of
https://github.com/servo/servo.git
synced 2025-08-12 17:05:33 +01:00
Update web-platform-tests to revision 66c4613f823c4384c78ada77346eda17bb128947
This commit is contained in:
parent
183772583f
commit
a91433f0c8
234 changed files with 4368 additions and 967 deletions
|
@ -86,7 +86,7 @@ gl.bufferSubData(gl.ARRAY_BUFFER, 10, array);
|
|||
wtu.glErrorShouldBe(gl, gl.NO_ERROR);
|
||||
|
||||
gl.bufferSubData(gl.ARRAY_BUFFER, 10, null);
|
||||
wtu.glErrorShouldBe(gl, gl.NO_ERROR);
|
||||
wtu.glErrorShouldBe(gl, [gl.NO_ERROR, gl.INVALID_VALUE]);
|
||||
|
||||
var successfullyParsed = true;
|
||||
</script>
|
||||
|
|
|
@ -118,8 +118,8 @@ function runTestDisabled() {
|
|||
|
||||
var tex = gl.createTexture();
|
||||
gl.bindTexture(gl.TEXTURE_2D, tex);
|
||||
wtu.shouldGenerateGLError(gl, gl.INVALID_ENUM, 'gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, null)');
|
||||
wtu.shouldGenerateGLError(gl, gl.INVALID_ENUM, 'gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, null)');
|
||||
wtu.shouldGenerateGLError(gl, [gl.INVALID_ENUM, gl.INVALID_VALUE], 'gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_SHORT, null)');
|
||||
wtu.shouldGenerateGLError(gl, [gl.INVALID_ENUM, gl.INVALID_VALUE], 'gl.texImage2D(gl.TEXTURE_2D, 0, gl.DEPTH_COMPONENT, 1, 1, 0, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, null)');
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ Tests.testTexImage2D = function(gl) {
|
|||
assertGLError(gl, gl.INVALID_ENUM, "bad target", function(){
|
||||
gl.texImage2D(gl.FLOAT, 0, gl.RGBA, 1,1,0,gl.RGBA,gl.UNSIGNED_BYTE, null);
|
||||
});
|
||||
assertGLError(gl, gl.INVALID_ENUM, "bad internal format/format", function(){
|
||||
assertGLError(gl, [gl.INVALID_ENUM, gl.INVALID_VALUE], "bad internal format/format", function(){
|
||||
gl.texImage2D(gl.TEXTURE_2D, 0, gl.FLOAT, 1,1,0,gl.FLOAT,gl.UNSIGNED_BYTE, null);
|
||||
});
|
||||
assertGLError(gl, gl.INVALID_VALUE, "border > 0", function(){
|
||||
|
|
|
@ -1020,6 +1020,40 @@ function assertGLError(gl, err, name, f) {
|
|||
return true;
|
||||
}
|
||||
|
||||
// Assert that f generates a GL error from a list.
|
||||
function assertGLErrorIn(gl, expectedErrorList, name, f) {
|
||||
if (f == null) { f = name; name = null; }
|
||||
|
||||
var actualError = 0;
|
||||
try {
|
||||
f();
|
||||
} catch(e) {
|
||||
if ('glError' in e) {
|
||||
actualError = e.glError;
|
||||
} else {
|
||||
testFailed("assertGLError: UNEXPCETED EXCEPTION", name, f);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
var expectedErrorStrList = [];
|
||||
var expectedErrorSet = {};
|
||||
for (var i in expectedErrorList) {
|
||||
var cur = expectedErrorList[i];
|
||||
expectedErrorSet[cur] = true;
|
||||
expectedErrorStrList.push(getGLErrorAsString(gl, cur));
|
||||
}
|
||||
var expectedErrorListStr = "[" + expectedErrorStrList.join(", ") + "]";
|
||||
|
||||
if (actualError in expectedErrorSet) {
|
||||
return true;
|
||||
}
|
||||
|
||||
testFailed("assertGLError: expected: " + expectedErrorListStr +
|
||||
" actual: " + getGLErrorAsString(gl, actualError), name, f);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Assert that f generates some GL error. Used in situations where it's
|
||||
// ambigious which of multiple possible errors will be generated.
|
||||
function assertSomeGLError(gl, name, f) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue