[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mjs at apple.com
mjs at apple.com
Sun Feb 20 23:20:22 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 3bf4766099af7765d4237f143eb971c17fb4c1ce
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 00:13:30 2011 +0000
2011-01-19 Maciej Stachowiak <mjs at apple.com>
Reviewed by Anders Carlsson.
If resetting between tests times out, treat it as a WebProcess crash
https://bugs.webkit.org/show_bug.cgi?id=52757
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::runTest):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76178 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d5a0e76..e501334 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-19 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ If resetting between tests times out, treat it as a WebProcess crash
+ https://bugs.webkit.org/show_bug.cgi?id=52757
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::runTest):
+
2011-01-19 Alexey Proskuryakov <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index 05eda8e..de99271 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -335,8 +335,11 @@ bool TestController::resetStateToConsistentValues()
bool TestController::runTest(const char* test)
{
- if (!resetStateToConsistentValues())
+ if (!resetStateToConsistentValues()) {
+ fputs("#CRASHED - WebProcess\n", stderr);
+ fflush(stderr);
return false;
+ }
m_state = RunningTest;
m_currentInvocation.set(new TestInvocation(test));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list