Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-25 08:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update WebGL conformance suite patches

Browse source
This commit is contained in:
Imanol Fernandez 2017-10-30 19:04:51 +01:00
parent b5043de011
commit c4bb30413c
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/wpt/mozilla/tests/webgl/tools/js-test-pre.patch
View file

@ -1,6 +1,8 @@
--- js-test-pre.orig.js 2016-04-08 22:35:15.629226767 +0200 diff --git a/conformance-suites/1.0.3/resources/js-test-pre.js b/conformance-suites/1.0.3/resources/js-test-pre.js
+++ js-test-pre.js 2016-04-08 22:43:11.906092062 +0200 index 2a03001..c4bb653 100644
@@ -71,11 +71,25 @@ --- a/conformance-suites/1.0.3/resources/js-test-pre.js
+++ b/conformance-suites/1.0.3/resources/js-test-pre.js
@@ -71,11 +71,25 @@ function nonKhronosFrameworkNotifyDone() {
} }
} }
@ -30,10 +32,10 @@
function notifyFinishedToHarness() { function notifyFinishedToHarness() {
if (window.parent.webglTestHarness) { if (window.parent.webglTestHarness) {
@@ -100,2 +100,2 @@ function notifyFinishedToHarness() { @@ -86,13 +100,19 @@ function notifyFinishedToHarness() {
} }
} }
+(function() { +(function() {
+ var oldNotify = notifyFinishedToHarness; + var oldNotify = notifyFinishedToHarness;
+ var t = async_test("Overall test"); + var t = async_test("Overall test");
@ -43,7 +45,6 @@
function _logToConsole(msg) function _logToConsole(msg)
{ {
if (window.console) if (window.console)
@@ -92,7 +106,7 @@
window.console.log(msg); window.console.log(msg);
} }
@ -52,7 +53,7 @@
function enableJSTestPreVerboseLogging() function enableJSTestPreVerboseLogging()
{ {
@@ -105,31 +119,18 @@ @@ -105,31 +125,18 @@ function description(msg)
if (msg === undefined) { if (msg === undefined) {
msg = document.title; msg = document.title;
} }
@ -82,16 +83,16 @@
_addSpan(msg); _addSpan(msg);
if (_jsTestPreVerboseLogging) { if (_jsTestPreVerboseLogging) {
- _logToConsole(msg); - _logToConsole(msg);
+ _logToConsole(msg); + _logToConsole(msg);
} }
} }
@@ -143,7 +144,7 @@ @@ -143,7 +150,7 @@ function testPassed(msg)
reportTestResultsToHarness(true, msg); reportTestResultsToHarness(true, msg);
_addSpan('<span><span class="pass">PASS</span> ' + escapeHTML(msg) + '</span>'); _addSpan('<span><span class="pass">PASS</span> ' + escapeHTML(msg) + '</span>');
if (_jsTestPreVerboseLogging) { if (_jsTestPreVerboseLogging) {
- _logToConsole('PASS ' + msg); - _logToConsole('PASS ' + msg);
+ _logToConsole('PASS ' + msg); + _logToConsole('PASS ' + msg);
} }
} }

8
tests/wpt/mozilla/tests/webgl/tools/unit.patch
View file

@ -1,6 +1,8 @@
--- conformance/more/unit.js 2015-06-18 23:26:41.085626000 +0200 diff --git a/conformance-suites/1.0.3/conformance/more/unit.js b/conformance-suites/1.0.3/conformance/more/unit.js
+++ ../conformance-1.0.3/conformance/more/unit.js 2015-12-30 19:46:34.570636491 +0100 index 89f4e87..742f8d7 100644
@@ -892,9 +892,14 @@ --- a/conformance-suites/1.0.3/conformance/more/unit.js
+++ b/conformance-suites/1.0.3/conformance/more/unit.js
@@ -892,9 +892,14 @@ GLConstants = [
0x809D 0x809D
]; ];