[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
kenneth at webkit.org
kenneth at webkit.org
Thu Dec 3 13:38:29 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 0521d08d75a90a1ae3229148c061af22f76a5903
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 17 20:05:15 2009 +0000
Make the timeout 15 sec as for the other DRT's and make
it print out the same output when a test timeout.
Reviewed by Oliver Hunt.
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::waitUntilDone):
(LayoutTestController::notifyDone):
(LayoutTestController::timerEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51084 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index add6496..52b7212 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-17 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Oliver Hunt.
+
+ Make the timeout 15 sec as for the other DRT's and make
+ it print out the same output when a test timeout.
+
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::waitUntilDone):
+ (LayoutTestController::notifyDone):
+ (LayoutTestController::timerEvent):
+
2009-11-17 Joseph Pecoraro <joepeck at webkit.org>
Reviewed by Timothy Hatcher.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index d64664e..1303840 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -109,7 +109,7 @@ void LayoutTestController::waitUntilDone()
{
//qDebug() << ">>>>waitForDone";
m_waitForDone = true;
- m_timeoutTimer.start(11000, this);
+ m_timeoutTimer.start(15000, this);
}
QString LayoutTestController::counterValueForElementById(const QString& id)
@@ -125,13 +125,15 @@ void LayoutTestController::keepWebHistory()
void LayoutTestController::notifyDone()
{
qDebug() << ">>>>notifyDone";
+
+ m_isLoading = false;
+ m_waitForDone = false;
+ m_waitForPolicy = false;
+
if (!m_timeoutTimer.isActive())
return;
m_timeoutTimer.stop();
emit done();
- m_isLoading = false;
- m_waitForDone = false;
- m_waitForPolicy = false;
}
int LayoutTestController::windowCount()
@@ -209,7 +211,9 @@ void LayoutTestController::provisionalLoad()
void LayoutTestController::timerEvent(QTimerEvent *ev)
{
if (ev->timerId() == m_timeoutTimer.timerId()) {
- //qDebug() << ">>>>>>>>>>>>> timeout";
+ const char* message = "FAIL: Timed out waiting for notifyDone to be called\n";
+ fprintf(stderr, "%s", message);
+ fprintf(stdout, "%s", message);
notifyDone();
} else
QObject::timerEvent(ev);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list