diff options
| author | Jose <jose@zeroc.com> | 2016-10-04 10:20:24 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-10-04 10:20:24 +0200 |
| commit | 8c3173fc13a8642e3a165f23f9bf1d087aec4a55 (patch) | |
| tree | 2b75200cedf2241e5894f996bfc95e70c1fd685d /js/test/Common/TestSuite.js | |
| parent | Another fix for ICE-7399 (diff) | |
| download | ice-8c3173fc13a8642e3a165f23f9bf1d087aec4a55.tar.bz2 ice-8c3173fc13a8642e3a165f23f9bf1d087aec4a55.tar.xz ice-8c3173fc13a8642e3a165f23f9bf1d087aec4a55.zip | |
Fixed (ICE-7404) - js Ice/binding hung on Windows with Chrome
Diffstat (limited to 'js/test/Common/TestSuite.js')
| -rw-r--r-- | js/test/Common/TestSuite.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/js/test/Common/TestSuite.js b/js/test/Common/TestSuite.js index 41f5773202b..9afdc7db260 100644 --- a/js/test/Common/TestSuite.js +++ b/js/test/Common/TestSuite.js @@ -54,7 +54,7 @@ $(document).ready( $("#test").val("/test/" + current + "/index.html"); $("#worker").prop("checked", query.worker == "true"); $("#loop").prop("checked", query.loop == "true"); - + function nextTest() { document.location.assign(new URI() @@ -83,7 +83,7 @@ $(document).ready( updateLocation(); } } - + function setRunning(running) { if(running) @@ -104,7 +104,7 @@ $(document).ready( $("#run").removeClass("disabled"); } } - + function updateLocation() { document.location.assign(new URI() @@ -137,6 +137,7 @@ $(document).ready( } else if(e.data.type == "TestFinished") { + worker.terminate(); setRunning(false); next(e.data.success); } @@ -154,6 +155,11 @@ $(document).ready( files: TestCases[current].files } }); + + worker.onerror = function(e) + { + console.log(e); + }; } else { @@ -187,7 +193,7 @@ $(document).ready( updateLocation(); return false; }); - + $("#worker").on("change", function(e) { |