578509 - Update our copy of the WebGL conformance test suite to svn 11955

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Update webgl tests to svn r11929

This syncs our webgl test directory with upstream. It removes some existing tests but none of them seem to be custom stuff of ours.

The only nontrivial thing is that this patch also removes test_list.txt.js, as it didn't seem to be useful anymore. Is this OK?

Here is how our resulting directory compares to the khronos.org version:

$ diff -r . ~/mozilla-central/content/canvas/test/webgl/ | grep -v svn
Only in /home/bjacob/mozilla-central/content/canvas/test/webgl/: README.mozilla

Comment 1

[Benoit Jacob [:bjacob] (mostly away)]

arf, I forgot to edit README.mozilla to mention the new svn revision number. Will do. Not regenerating, as this is a very big patch.

Comment 2

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

test_list.txt.js is still useful -- note the removal of the <script> line that references it.  That's what made it possible to run the tests from a file:// URI instead of having to load them over the network (or setting strict file URI policy to off I guess, though I didn't test that).  Can you leave that <script> tag in and just update the .js file?  I'd like to push the <script> change upstream as well (it'll just not do anything if the js file doesn't exist).

Also I wonder why:

-shouldGenerateGLError(context, context.NO_ERROR, "context.drawArrays(context.TRIANGLES, 1, 0)");
+shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawArrays(context.TRIANGLES, 1, 0)");
 shouldGenerateGLError(context, context.INVALID_VALUE, "context.drawArrays(context.TRIANGLES, -1, 0)");
+shouldGenerateGLError(context, context.NO_ERROR, "context.drawArrays(context.TRIANGLES, 0, 0)");
+shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawArrays(context.TRIANGLES, 100, 0)");

the TRIANGLES, 100, 0 case is the same as the TRIANGLES, 1, 0 case; no need to test it twice I'd think.  Though that's an upstream thing and doesn't really matter.

Comment 3

[Benoit Jacob [:bjacob] (mostly away)]

(In reply to comment #2)
> test_list.txt.js is still useful -- note the removal of the <script> line that
> references it.  That's what made it possible to run the tests from a file://
> URI instead of having to load them over the network (or setting strict file URI
> policy to off I guess, though I didn't test that).  Can you leave that <script>
> tag in and just update the .js file?  I'd like to push the <script> change
> upstream as well (it'll just not do anything if the js file doesn't exist).

It seems that this has been fixed in another way? Here, I can run the conformance test suite by going to this URL,

file:///home/bjacob/webgl/sdk/tests/webgl-conformance-tests.html

which is my checkout of khronos.org.

So, given that this works at least here, is it safe to conclude that test_list.txt.js is not needed anymore?

> 
> Also I wonder why:
> 
> -shouldGenerateGLError(context, context.NO_ERROR,
> "context.drawArrays(context.TRIANGLES, 1, 0)");
> +shouldGenerateGLError(context, context.INVALID_OPERATION,
> "context.drawArrays(context.TRIANGLES, 1, 0)");
>  shouldGenerateGLError(context, context.INVALID_VALUE,
> "context.drawArrays(context.TRIANGLES, -1, 0)");
> +shouldGenerateGLError(context, context.NO_ERROR,
> "context.drawArrays(context.TRIANGLES, 0, 0)");
> +shouldGenerateGLError(context, context.INVALID_OPERATION,
> "context.drawArrays(context.TRIANGLES, 100, 0)");
> 
> the TRIANGLES, 100, 0 case is the same as the TRIANGLES, 1, 0 case; no need to
> test it twice I'd think.  Though that's an upstream thing and doesn't really
> matter.

Yes, and in the same way, there's been an amazing number of fixes / improvements since yesterday, so I'm syncing to a newer svn revision.

Comment 4

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Update webgl tests to svn r11955

Here's a new patch generated from svn 11955 which seems to have a good number of improvements over 11929.

This time I used svn export, replaced the directory contents, and re-added README.mozilla.

Comment 5

[Benoit Jacob [:bjacob] (mostly away)]

Note: still removing test_list.txt.js as explained in comment 3 (it seems to not be needed anymore).

Comment 6

[Benoit Jacob [:bjacob] (mostly away)]

http://hg.mozilla.org/mozilla-central/rev/4f0544be5a87