Bug 679864 - [5/5] Upgrade WebGL conformance test suite to r15318
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 19 Aug 2011 11:39:00 -0400
changeset 75647 7a9079ac5718060ff0d496910d9d2107124ccc1c
parent 75646 f75a4788bf96837384a2e19d882fbe19a6824a6d
child 75655 c8f2a44d604b3ff4dce90c60fa03439c58ca9a66
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
bugs679864
milestone9.0a1
Bug 679864 - [5/5] Upgrade WebGL conformance test suite to r15318 This is just removing some old cruft, mainly old patches that are not needed anymore.
content/canvas/test/webgl/delete-quickCheckAPI.patch
content/canvas/test/webgl/disable-gl-min-textures.patch
content/canvas/test/webgl/increase-timeout-delays.patch
deleted file mode 100644
--- a/content/canvas/test/webgl/delete-quickCheckAPI.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# Parent 0d4172be40b03cc4dbe704244623174363cec0bf
-diff --git a/content/canvas/test/webgl/conformance/more/00_test_list.txt b/content/canvas/test/webgl/conformance/more/00_test_list.txt
---- a/content/canvas/test/webgl/conformance/more/00_test_list.txt
-+++ b/content/canvas/test/webgl/conformance/more/00_test_list.txt
-@@ -1,12 +1,12 @@
- conformance/constants.html
- conformance/getContext.html
- conformance/methods.html
--conformance/quickCheckAPI.html
-+#conformance/quickCheckAPI.html
- conformance/webGLArrays.html
- functions/bindBuffer.html
- functions/bindBufferBadArgs.html
- functions/bindFramebufferLeaveNonZero.html
- functions/bufferData.html
- functions/bufferDataBadArgs.html
- functions/bufferSubData.html
- functions/bufferSubDataBadArgs.html
deleted file mode 100644
--- a/content/canvas/test/webgl/disable-gl-min-textures.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch
-# Parent 59a9fa08e7308ecc5942f76387340dd209bcc644
-diff --git a/content/canvas/test/webgl/conformance/00_test_list.txt b/content/canvas/test/webgl/conformance/00_test_list.txt
---- a/content/canvas/test/webgl/conformance/00_test_list.txt
-+++ b/content/canvas/test/webgl/conformance/00_test_list.txt
-@@ -25,17 +25,17 @@ gl-enable-enum-test.html
- gl-enable-vertex-attrib.html
- gl-enum-tests.html
- gl-get-active-attribute.html
- gl-get-active-uniform.html
- gl-get-calls.html
- gl-getshadersource.html
- gl-getstring.html
- gl-min-attribs.html
--gl-min-textures.html
-+# gl-min-textures.html
- gl-min-uniforms.html
- gl-object-get-calls.html
- gl-pixelstorei.html
- gl-scissor-test.html
- gl-shader-test.html
- gl-teximage.html
- gl-uniform-arrays.html
- gl-uniform-bool.html
deleted file mode 100644
--- a/content/canvas/test/webgl/increase-timeout-delays.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# Parent cabbf6f041cd51f04c31b5f4467a49ecea0f052a
-diff --git a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
---- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
-+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
-@@ -270,30 +270,30 @@ function start() {
-     if (ctx) {
-         var iframe = document.getElementById("testframe");
-         var testHarness = new WebGLTestHarnessModule.TestHarness(
-             iframe,
-             '00_test_list.txt',
-             function(type, msg, success) {
-                 return reporter.reportFunc(type, msg, success);
-             });
--        testHarness.setTimeoutDelay(10000); // and make it much higher when running under valgrind.
-+        testHarness.setTimeoutDelay(20000); // and make it much higher when running under valgrind.
-         window.webglTestHarness = testHarness;
-         testHarness.runTests();
-     } else {
-         var errmsg = "Can't create a WebGL context";
-         reporter.fullResultsNode.textContent = errmsg;
-         ok(false, errmsg);
-         dump("WebGL mochitest failed: " + errmsg + "\n");
-         reporter.finishedTestSuite();
-     }
-   };
- 
-   SimpleTest.waitForExplicitFinish();
--  SimpleTest.requestLongerTimeout(2);
-+  SimpleTest.requestLongerTimeout(3);
- 
-   var kIsWindows = false;
-   var kIsMac = false;
-   var kIsLinux = false;
-   if (navigator.platform.indexOf("Win") == 0)
-     kIsWindows = true;
-   else if (navigator.platform.indexOf("Linux") == 0)
-     kIsLinux = true;