diff options
author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /LayoutTests/fast/js | |
parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'LayoutTests/fast/js')
-rw-r--r-- | LayoutTests/fast/js/resources/js-test-post.js | 10 | ||||
-rw-r--r-- | LayoutTests/fast/js/resources/js-test-pre.js | 13 |
2 files changed, 16 insertions, 7 deletions
diff --git a/LayoutTests/fast/js/resources/js-test-post.js b/LayoutTests/fast/js/resources/js-test-post.js index 88882c5..11a9e5f 100644 --- a/LayoutTests/fast/js/resources/js-test-post.js +++ b/LayoutTests/fast/js/resources/js-test-post.js @@ -1,13 +1,9 @@ -function finishJSTest() -{ - shouldBeTrue("successfullyParsed"); - debug('<br /><span class="pass">TEST COMPLETE</span>'); - if (window.jsTestIsAsync && window.layoutTestController) - layoutTestController.notifyDone(); -} +wasPostTestScriptParsed = true; if (window.jsTestIsAsync) { if (window.layoutTestController) layoutTestController.waitUntilDone(); + if (window.wasFinishJSTestCalled) + finishJSTest(); } else finishJSTest(); diff --git a/LayoutTests/fast/js/resources/js-test-pre.js b/LayoutTests/fast/js/resources/js-test-pre.js index aaab749..87db5d4 100644 --- a/LayoutTests/fast/js/resources/js-test-pre.js +++ b/LayoutTests/fast/js/resources/js-test-pre.js @@ -280,3 +280,16 @@ function gc() { gcRec(10) } } + +// It's possible for an async test to call finishJSTest() before js-test-post.js +// has been parsed. +function finishJSTest() +{ + wasFinishJSTestCalled = true; + if (!window.wasPostTestScriptParsed) + return; + shouldBeTrue("successfullyParsed"); + debug('<br /><span class="pass">TEST COMPLETE</span>'); + if (window.jsTestIsAsync && window.layoutTestController) + layoutTestController.notifyDone(); +} |