Changeset 53526 in webkit

Timestamp:

Jan 20, 2010 12:20:59 AM (14 years ago)

Author:

vestbo@webkit.org

Message:

[Qt] Don't use QSocketNotifier in the DRT for reading stdin

Reviewed by Simon Hausmann.

QSocketNotifier is not available on Windows. Instead we read
stdin synchronously after each test using signals and slots.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:
• DumpRenderTree/qt/DumpRenderTreeQt.h:
• DumpRenderTree/qt/main.cpp:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (5 diffs)
• DumpRenderTree/qt/DumpRenderTreeQt.h (modified) (5 diffs)
• DumpRenderTree/qt/main.cpp (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-19  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Don't use QSocketNotifier in the DRT for reading stdin
+
+        QSocketNotifier is not available on Windows. Instead we read
+        stdin synchronously after each test using signals and slots.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/main.cpp:
+
 2010-01-19  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -311 +311 @@
     : m_dumpPixels(false)
     , m_stdin(0)
-    , m_notifier(0)
     , m_enableTextOutput(false)
+    , m_singleFileMode(false)
 {
     qt_drt_overwritePluginDirectories();
@@ -360 +360 @@
     delete m_mainView;
     delete m_stdin;
-    delete m_notifier;
-}
-
-void DumpRenderTree::open()
-{
-    if (!m_stdin) {
-        m_stdin = new QFile;
-        m_stdin->open(stdin, QFile::ReadOnly);
-    }
-
-    if (!m_notifier) {
-        m_notifier = new QSocketNotifier(STDIN_FILENO, QSocketNotifier::Read);
-        connect(m_notifier, SIGNAL(activated(int)), this, SLOT(readStdin(int)));
-    }
 }
 
@@ -459 +445 @@
 }
 
-void DumpRenderTree::readStdin(int /* socket */)
-{
-    // Read incoming data from stdin...
-    QByteArray line = m_stdin->readLine();
-    if (line.endsWith('\n'))
-        line.truncate(line.size()-1);
-    //fprintf(stderr, "\n    opening %s\n", line.constData());
-    if (line.isEmpty())
-        quit();
-
-    if (line.startsWith("http:") || line.startsWith("https:"))
+void DumpRenderTree::readLine()
+{
+    if (!m_stdin) {
+        m_stdin = new QFile;
+        m_stdin->open(stdin, QFile::ReadOnly);
+
+        if (!m_stdin->isReadable()) {
+            emit quit();
+            return;
+        }
+    }
+
+    QByteArray line = m_stdin->readLine().trimmed();
+
+    if (line.isEmpty()) {
+        emit quit();
+        return;
+    }
+
+    processLine(QString::fromLocal8Bit(line.constData(), line.length()));
+}
+
+void DumpRenderTree::processLine(const QString &input)
+{
+    QString line = input;
+
+    if (line.startsWith(QLatin1String("http:"))
+            || line.startsWith(QLatin1String("https:"))
+            || line.startsWith(QLatin1String("file:"))) {
         open(QUrl(line));
-    else {
+    } else {
         QFileInfo fi(line);
+
+        if (!fi.exists()) {
+            QDir currentDir = QDir::currentPath();
+
+            // Try to be smart about where the test is located
+            if (currentDir.dirName() == QLatin1String("LayoutTests"))
+                fi = QFileInfo(currentDir, line.replace(QRegExp(".*?LayoutTests/(.*)"), "\\1"));
+            else if (!line.contains(QLatin1String("LayoutTests")))
+                fi = QFileInfo(currentDir, line.prepend(QLatin1String("LayoutTests/")));
+
+            if (!fi.exists()) {
+                if (isSingleFileMode())
+                    emit quit();
+                else
+                    emit ready();
+
+                return;
+            }
+
+        }
+
         open(QUrl::fromLocalFile(fi.absoluteFilePath()));
     }
@@ -618 +643 @@
     QWebFrame *mainFrame = m_page->mainFrame();
 
-    //fprintf(stderr, "    Dumping\n");
-    if (!m_notifier) {
-        // Dump markup in single file mode...
+    if (isSingleFileMode()) {
         QString markup = mainFrame->toHtml();
         fprintf(stdout, "Source:\n\n%s\n", markup.toUtf8().constData());
@@ -698 +721 @@
     fflush(stderr);
 
-    if (!m_notifier)
-        quit(); // Exit now in single file mode...
+    if (isSingleFileMode())
+        emit quit();
+    else
+        emit ready();
 }
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -69 +69 @@
     virtual ~DumpRenderTree();
 
-    // Initialize in multi-file mode, used by run-webkit-tests.
-    void open();
-
     // Initialize in single-file mode.
     void open(const QUrl& url);
@@ -77 +74 @@
     void setTextOutputEnabled(bool enable) { m_enableTextOutput = enable; }
     bool isTextOutputEnabled() { return m_enableTextOutput; }
+
+    void setSingleFileMode(bool flag) { m_singleFileMode = flag; }
+    bool isSingleFileMode() { return m_singleFileMode; }
 
     void setDumpPixels(bool);
@@ -101 +101 @@
 public Q_SLOTS:
     void initJSObjects();
-    void readStdin(int);
+
+    void readLine();
+    void processLine(const QString&);
+
     void dump();
     void titleChanged(const QString &s);
@@ -110 +113 @@
 Q_SIGNALS:
     void quit();
+    void ready();
 
 private:
@@ -127 +131 @@
 
     QFile *m_stdin;
-    QSocketNotifier* m_notifier;
 
     QList<QObject*> windows;
     bool m_enableTextOutput;
+    bool m_singleFileMode;
 };
 

trunk/WebKitTools/DumpRenderTree/qt/main.cpp

@@ -41 +41 @@
 #include <qwebdatabase.h>
 #include <qdesktopservices.h>
+#include <qtimer.h>
 #include <qwindowsstyle.h>
 
@@ -134 +135 @@
     QStringList args = app.arguments();
     if (args.count() < 2) {
-        qDebug() << "Usage: DumpRenderTree [-v] filename";
+        qDebug() << "Usage: DumpRenderTree [-v|--pixel-tests] filename";
         exit(0);
     }
 
-    // supress debug output from Qt if not started with -v
+    // Suppress debug output from Qt if not started with -v
     if (!args.contains(QLatin1String("-v")))
         qInstallMsgHandler(messageHandler);
@@ -144 +145 @@
     WebCore::DumpRenderTree dumper;
 
-    if (args.contains("--pixel-tests"))
+    if (args.contains(QLatin1String("--pixel-tests")))
         dumper.setDumpPixels(true);
 
@@ -151 +152 @@
     QWebDatabase::removeAllDatabases();
 
-    if (args.last() == QLatin1String("-")) {
-        dumper.open();
+    if (args.contains(QLatin1String("-"))) {
+        QObject::connect(&dumper, SIGNAL(ready()), &dumper, SLOT(readLine()), Qt::QueuedConnection);
+        QTimer::singleShot(0, &dumper, SLOT(readLine()));
     } else {
-        if (!args.last().startsWith("/")
-            && !args.last().startsWith("file:")
-            && !args.last().startsWith("http:")
-            && !args.last().startsWith("https:")) {
-            QString path = QDir::currentPath();
-            if (!path.endsWith('/'))
-                path.append('/');
-            args.last().prepend(path);
+        dumper.setSingleFileMode(true);
+        for (int i = 1; i < args.size(); ++i) {
+            if (!args.at(i).startsWith('-')) {
+                dumper.processLine(args.at(i));
+                break;
+            }
         }
-        dumper.open(QUrl(args.last()));
     }
+
     return app.exec();
+
 #ifdef Q_WS_X11
     FcConfigSetCurrent(0);