diff --git a/tests/wpt/webgl/tools/import-conformance-tests.py b/tests/wpt/webgl/tools/import-conformance-tests.py index 56d9ac2f61a..38c8e3ec431 100755 --- a/tests/wpt/webgl/tools/import-conformance-tests.py +++ b/tests/wpt/webgl/tools/import-conformance-tests.py @@ -13,7 +13,6 @@ KHRONOS_REPO_URL = "https://github.com/KhronosGroup/WebGL.git" PATCHES = [ ("js-test-pre.patch", "js/js-test-pre.js"), ("unit.patch", "conformance/more/unit.js"), - ("unit2.patch", "conformance/more/unit.js"), ("timeout.patch", None) ] diff --git a/tests/wpt/webgl/tools/unit.patch b/tests/wpt/webgl/tools/unit.patch index 43c57b9dbb4..95eaedb59ad 100644 --- a/tests/wpt/webgl/tools/unit.patch +++ b/tests/wpt/webgl/tools/unit.patch @@ -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 -index 89f4e87..742f8d7 100644 ---- 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 ++++ b/conformance/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, @@ -892,9 +892,14 @@ GLConstants = [ 0x809D ]; - + +var WPT_TEST_ID = 0; function reportTestResultsToHarness(success, msg) { 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() { diff --git a/tests/wpt/webgl/tools/unit2.patch b/tests/wpt/webgl/tools/unit2.patch deleted file mode 100644 index 7678d4ae72a..00000000000 --- a/tests/wpt/webgl/tools/unit2.patch +++ /dev/null @@ -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() {