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

Merge unit.patch and unit2.patch

Browse source
This commit is contained in:
Anthony Ramine 2018-08-27 21:42:29 +02:00
parent b1ce74caa5
commit 428b305ea6
3 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/wpt/webgl/tools/import-conformance-tests.py
View file

@ -13,7 +13,6 @@ KHRONOS_REPO_URL = "https://github.com/KhronosGroup/WebGL.git"
PATCHES = [ PATCHES = [
("js-test-pre.patch", "js/js-test-pre.js"), ("js-test-pre.patch", "js/js-test-pre.js"),
("unit.patch", "conformance/more/unit.js"), ("unit.patch", "conformance/more/unit.js"),
("unit2.patch", "conformance/more/unit.js"),
("timeout.patch", None) ("timeout.patch", None)
] ]

29
tests/wpt/webgl/tools/unit.patch
View file

@ -1,11 +1,20 @@
diff --git a/conformance-suites/1.0.3/conformance/more/unit.js b/conformance-suites/1.0.3/conformance/more/unit.js --- a/conformance/conformance/more/unit.js
index 89f4e87..742f8d7 100644 +++ b/conformance/conformance/more/unit.js
--- a/conformance-suites/1.0.3/conformance/more/unit.js @@ -53,6 +53,10 @@ if (window.internals) {
+++ b/conformance-suites/1.0.3/conformance/more/unit.js window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
}
+if (window.async_test) {
+ var __overall_test = async_test('Overall test');
+}
+
/* -- end platform specific code --*/
Tests = {
autorun : true,
@@ -892,9 +892,14 @@ GLConstants = [ @@ -892,9 +892,14 @@ GLConstants = [
0x809D 0x809D
]; ];
+var WPT_TEST_ID = 0; +var WPT_TEST_ID = 0;
function reportTestResultsToHarness(success, msg) { function reportTestResultsToHarness(success, msg) {
if (window.parent.webglTestHarness) { if (window.parent.webglTestHarness) {
@ -17,3 +26,13 @@ index 89f4e87..742f8d7 100644
} }
} }
@@ -907,6 +911,9 @@ function notifyFinishedToHarness() {
if (window.parent.webglTestHarness) {
window.parent.webglTestHarness.notifyFinished(window.location.pathname);
}
+ if (window.__overall_test) {
+ window.__overall_test.done();
+ }
}
function initTests() {

25
tests/wpt/webgl/tools/unit2.patch
View file

@ -1,25 +0,0 @@
diff --git a/conformance-suites/1.0.3/conformance/more/unit.js b/conformance-suits/1.0.3/conformance/more/unit.js
index 742f8d7b9d..428c164699 100644
--- a/conformance-suites/1.0.3/conformance/more/unit.js
+++ b/conformance-suites/1.0.3/conformance/more/unit.js
@@ -53,6 +53,10 @@ if (window.internals) {
window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
}
+if (window.async_test) {
+ var __overall_test = async_test('Overall test');
+}
+
/* -- end platform specific code --*/
Tests = {
autorun : true,
@@ -907,6 +911,9 @@ function notifyFinishedToHarness() {
if (window.parent.webglTestHarness) {
window.parent.webglTestHarness.notifyFinished(window.location.pathname);
}
+ if (window.__overall_test) {
+ window.__overall_test.done();
+ }
}
function initTests() {