Changeset 107171 in webkit

Timestamp:

Feb 8, 2012, 8:04:54 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt][DRT] DumpRenderTreeQt should support --no-timeout and --timeout options
​https://bugs.webkit.org/show_bug.cgi?id=78146

Patch by Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org> on 2012-02-08
Reviewed by Ryosuke Niwa.

Our DumpRenderTree should support --no-timeout and --timeout options in order
to be able to use run-perf-tests and have a Performance Bot.
This patch adds setTimeout and setShouldTimeout functions to our LayoutTestController
and the necessary code to handle such command line arguments to our DumpRenderTree.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::DumpRenderTree::setTimeout):
(WebCore):
(WebCore::DumpRenderTree::setShouldTimeout):

• DumpRenderTree/qt/DumpRenderTreeQt.h:

(DumpRenderTree):

• DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::LayoutTestController):
(LayoutTestController::waitUntilDone):
(LayoutTestController::notifyDone):

• DumpRenderTree/qt/LayoutTestControllerQt.h:

(LayoutTestController::setTimeout):
(LayoutTestController::setShouldTimeout):
(LayoutTestController):

• DumpRenderTree/qt/main.cpp:

(isOption):
(printUsage):
(main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)
• DumpRenderTree/qt/DumpRenderTreeQt.h (modified) (1 diff)
• DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (3 diffs)
• DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (2 diffs)
• DumpRenderTree/qt/main.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-08  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt][DRT] DumpRenderTreeQt should support --no-timeout and --timeout options
+        https://bugs.webkit.org/show_bug.cgi?id=78146
+
+        Reviewed by Ryosuke Niwa.
+
+        Our DumpRenderTree should support --no-timeout and --timeout options in order
+        to be able to use run-perf-tests and have a Performance Bot.
+        This patch adds setTimeout and setShouldTimeout functions to our LayoutTestController
+        and the necessary code to handle such command line arguments to our DumpRenderTree.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::setTimeout):
+        (WebCore):
+        (WebCore::DumpRenderTree::setShouldTimeout):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        (DumpRenderTree):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::waitUntilDone):
+        (LayoutTestController::notifyDone):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        (LayoutTestController::setTimeout):
+        (LayoutTestController::setShouldTimeout):
+        (LayoutTestController):
+        * DumpRenderTree/qt/main.cpp:
+        (isOption):
+        (printUsage):
+        (main):
+
 2012-02-08  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -1139 +1139 @@
 }
 
-}
+void DumpRenderTree::setTimeout(int timeout)
+{
+    m_controller->setTimeout(timeout);
+}
+
+void DumpRenderTree::setShouldTimeout(bool flag)
+{
+    m_controller->setShouldTimeout(flag);
+}
+
+}

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -107 +107 @@
     void setRedirectErrorFileName(const QString& fileName) { m_redirectErrorFileName = fileName; }
 
+    void setTimeout(int);
+    void setShouldTimeout(bool flag);
+
 public Q_SLOTS:
     void initJSObjects();

trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -42 +42 @@
     : QObject()
     , m_drt(drt)
+    , m_shouldTimeout(true)
+    , m_timeout(30000)
 {
     reset();
@@ -147 +149 @@
     //qDebug() << ">>>>waitForDone";
     m_waitForDone = true;
-    m_timeoutTimer.start(30000, this);
+
+    if (!m_shouldTimeout)
+        return;
+
+    m_timeoutTimer.start(m_timeout, this);
 }
 
@@ -179 +185 @@
     qDebug() << ">>>>notifyDone";
 
-    if (!m_timeoutTimer.isActive())
+    if (m_shouldTimeout && !m_timeoutTimer.isActive())
         return;
 

trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -80 +80 @@
     static const unsigned int maxViewWidth;
     static const unsigned int maxViewHeight;
+
+    void setTimeout(int timeout) { m_timeout = timeout; }
+    void setShouldTimeout(bool flag) { m_shouldTimeout = flag; }
 
 protected:
@@ -318 +321 @@
     QStringList m_desktopNotificationAllowedOrigins;
     bool m_ignoreDesktopNotification;
+
+    bool m_shouldTimeout;
+    int m_timeout;
 };
 

trunk/Tools/DumpRenderTree/qt/main.cpp

@@ -74 +74 @@
     return str == QString("-v") || str == QString("--pixel-tests")
            || str == QString("--stdout") || str == QString("--stderr")
+           || str == QString("--timeout") || str == QString("--no-timeout")
            || str == QString("-");
 }
@@ -90 +91 @@
 void printUsage()
 {
-    fprintf(stderr, "Usage: DumpRenderTree [-v|--pixel-tests] [--stdout output_filename] [-stderr error_filename] filename [filename2..n]\n");
+    fprintf(stderr, "Usage: DumpRenderTree [-v|--pixel-tests] [--stdout output_filename] [-stderr error_filename] [--no-timeout] [--timeout timeout_MS] filename [filename2..n]\n");
     fprintf(stderr, "Or folder containing test files: DumpRenderTree [-v|--pixel-tests] dirpath\n");
     fflush(stderr);
@@ -214 +215 @@
     QWebDatabase::removeAllDatabases();
 
+    index = args.indexOf(QLatin1String("--timeout"));
+    if (index != -1) {
+        int timeout = takeOptionValue(args, index).toInt();
+        dumper.setTimeout(timeout);
+        args.removeAt(index);
+    }
+
+    index = args.indexOf(QLatin1String("--no-timeout"));
+    if (index != -1) {
+        dumper.setShouldTimeout(false);
+        args.removeAt(index);
+    }
+
     index = args.indexOf(QLatin1String("-"));
     if (index != -1) {