From 8582d18d2ffb0556727acf57c46e0129af027e06 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 24 Aug 2018 12:01:15 +0200 Subject: [PATCH 1/3] Fix import-conformance-tests.py --- tests/wpt/mozilla/meta/MANIFEST.json | 2 +- tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 86cf8a862e2..e2e81119810 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -99166,7 +99166,7 @@ "testharness" ], "webgl/tools/import-conformance-tests.py": [ - "970c36cecac1e391866040b77a0cea91154e6084", + "55e183f9a5b2269ec75345786039cdb7f1106c0b", "support" ], "webgl/tools/js-test-pre.patch": [ diff --git a/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py b/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py index 970c36cecac..55e183f9a5b 100755 --- a/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py +++ b/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py @@ -19,7 +19,7 @@ PATCHES_1X = [ # Patches for conformance tests 2.0.x PATCHES_2X = [ ("js-test-pre2.patch", "js/js-test-pre.js"), - ("unit.patch", "conformance/more/unit.js") + ("unit.patch", "conformance/more/unit.js"), ("unit2.patch", "conformance/more/unit.js") ] From d4eb6b196e6d404dedad73f01f21a1ecdb8933c6 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 24 Aug 2018 12:06:30 +0200 Subject: [PATCH 2/3] Add newlines at the end of WebGL patches --- tests/wpt/mozilla/meta/MANIFEST.json | 4 ++-- tests/wpt/mozilla/tests/webgl/tools/timeout.patch | 2 +- tests/wpt/mozilla/tests/webgl/tools/unit2.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index e2e81119810..25b60bde1d2 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -99178,7 +99178,7 @@ "support" ], "webgl/tools/timeout.patch": [ - "7c20e5daba640a57aeb5cd8089de721a85f6d70c", + "fe3e3c877f3d24d103b30486c20d55467ee844f9", "support" ], "webgl/tools/unit.patch": [ @@ -99186,7 +99186,7 @@ "support" ], "webgl/tools/unit2.patch": [ - "c54efb4975bd7e7bac1db0a072e7b7303bc2a0cc", + "7678d4ae72ab17d623126db2fe192d48ba69948e", "support" ], "webgl/uniformMatrixNfv.html": [ diff --git a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch index 7c20e5daba6..fe3e3c877f3 100644 --- a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch +++ b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch @@ -117,4 +117,4 @@ index c1542f4fa9..b3ee786e0b 100644 + - \ No newline at end of file + diff --git a/tests/wpt/mozilla/tests/webgl/tools/unit2.patch b/tests/wpt/mozilla/tests/webgl/tools/unit2.patch index c54efb4975b..7678d4ae72a 100644 --- a/tests/wpt/mozilla/tests/webgl/tools/unit2.patch +++ b/tests/wpt/mozilla/tests/webgl/tools/unit2.patch @@ -22,4 +22,4 @@ index 742f8d7b9d..428c164699 100644 + } } - function initTests() { \ No newline at end of file + function initTests() { From da4f170ad65d81e654e54e10a54df1ed1a8b9ffe Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 24 Aug 2018 12:55:02 +0200 Subject: [PATCH 3/3] Update WebGL tests Apparently unit2.patch wasn't correctly applied. --- tests/wpt/mozilla/meta/MANIFEST.json | 10 +++++----- .../ogles/GL/struct/nestedstructcomb_various_frag.frag | 2 +- .../ogles/GL/struct/nestedstructcomb_various_vert.vert | 2 +- .../webgl/conformance-2.0.0/conformance/more/unit.js | 7 +++++++ .../ogles/GL/struct/nestedstructcomb_various_frag.frag | 2 +- .../ogles/GL/struct/nestedstructcomb_various_vert.vert | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 25b60bde1d2..5cf34aebf90 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -78066,11 +78066,11 @@ "support" ], "webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag": [ - "dcc9d901d33b5e726688a48eb7253de9abafa626", + "2cc51cfb64432e3fdffbc8929432e3a3fce83dcb", "support" ], "webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert": [ - "459d4d81d1717887b2a09ee46f94328ba350a059", + "e27de221f52b98da1bd0589e9ef587237d0afb37", "support" ], "webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_001_to_008.html": [ @@ -82618,7 +82618,7 @@ "support" ], "webgl/conformance-2.0.0/conformance/more/unit.js": [ - "a0614128f0ab91acc0aa2aa3ef6232ac5206dc2a", + "51433f33e84ccbd671f5fec20d961b3ac0701b3f", "support" ], "webgl/conformance-2.0.0/conformance/more/util.js": [ @@ -87626,11 +87626,11 @@ "support" ], "webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag": [ - "feb6532ed406514db669bbc30d144c84d70483f3", + "151888a883644f8205d8bb0fe6307c903c67f3c1", "support" ], "webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert": [ - "a84aeb9dfa707663f0581344cdcb05fd34fcd5d1", + "ddc2610fdd7794df32393ffccc3d1d4de3379ae3", "support" ], "webgl/conformance-2.0.0/conformance/ogles/GL/struct/struct_001_to_008.html": [ diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag index dcc9d901d33..2cc51cfb644 100644 --- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag +++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag @@ -28,7 +28,7 @@ precision mediump float; #endif varying vec4 color; -#define ERROR_EPSILON 0.1 +#define ERROR_EPSILON 0.125 void main (void){ struct second_nest diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert index 459d4d81d17..e27de221f52 100644 --- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert +++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert @@ -27,7 +27,7 @@ attribute vec4 gtf_Vertex; uniform mat4 gtf_ModelViewProjectionMatrix; varying vec4 color; -#define ERROR_EPSILON 0.1 +#define ERROR_EPSILON 0.125 void main (void) { diff --git a/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/more/unit.js b/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/more/unit.js index a0614128f0a..51433f33e84 100644 --- a/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/more/unit.js +++ b/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/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, @@ -949,6 +953,9 @@ function notifyFinishedToHarness() { if (window.parent.webglTestHarness) { window.parent.webglTestHarness.notifyFinished(window.location.pathname); } + if (window.__overall_test) { + window.__overall_test.done(); + } } function initTests() { diff --git a/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag b/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag index feb6532ed40..151888a8836 100644 --- a/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag +++ b/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag @@ -28,7 +28,7 @@ precision mediump float; #endif varying vec4 color; -#define ERROR_EPSILON 0.1 +#define ERROR_EPSILON 0.125 void main (void){ struct second_nest diff --git a/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert b/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert index a84aeb9dfa7..ddc2610fdd7 100644 --- a/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert +++ b/tests/wpt/mozilla/tests/webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert @@ -27,7 +27,7 @@ attribute vec4 gtf_Vertex; uniform mat4 gtf_ModelViewProjectionMatrix; varying vec4 color; -#define ERROR_EPSILON 0.1 +#define ERROR_EPSILON 0.125 void main (void) {