зеркало из https://github.com/mozilla/gecko-dev.git
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.
This commit is contained in:
Родитель
e639f41662
Коммит
de82bda127
|
@ -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
|
|
|
@ -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
|
|
|
@ -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;
|
|
Загрузка…
Ссылка в новой задаче