Diff
Modified: trunk/Source/WebKit2/ChangeLog (98982 => 98983)
--- trunk/Source/WebKit2/ChangeLog 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-01 18:30:46 UTC (rev 98983)
@@ -1,3 +1,22 @@
+2011-11-01 Andras Becsi <andras.be...@nokia.com>
+
+ [Qt][WK2] Make API tests less noisy
+ https://bugs.webkit.org/show_bug.cgi?id=71295
+
+ Reviewed by Simon Hausmann.
+
+ Suppress superfluous debug messages of Qt5.
+
+ * UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp:
+ * UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp:
+ * UIProcess/API/qt/tests/qmltests/qmltests.pro:
+ * UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp:
+ (main):
+ * UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp:
+ * UIProcess/API/qt/tests/util.cpp:
+ (messageHandler):
+ * UIProcess/API/qt/tests/util.h:
+
2011-11-01 Jocelyn Turcotte <jocelyn.turco...@nokia.com>
[Qt] Merge common desktop and touch view APIs under a base class.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp (98982 => 98983)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/tst_commonviewtests.cpp 2011-11-01 18:30:46 UTC (rev 98983)
@@ -180,7 +180,7 @@
viewAbstraction->hide();
}
-QTEST_MAIN(tst_CommonViewTests)
+QTWEBKIT_API_TEST_MAIN(tst_CommonViewTests)
#include "tst_commonviewtests.moc"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp (98982 => 98983)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qdesktopwebview/tst_qdesktopwebview.cpp 2011-11-01 18:30:46 UTC (rev 98983)
@@ -109,7 +109,7 @@
waitForSignal(webView(), SIGNAL(loadSucceeded()));
}
-QTEST_MAIN(tst_QDesktopWebView)
+QTWEBKIT_API_TEST_MAIN(tst_QDesktopWebView)
#include "tst_qdesktopwebview.moc"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro (98982 => 98983)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro 2011-11-01 18:30:46 UTC (rev 98983)
@@ -1,9 +1,9 @@
-TEMPLATE = app
-TARGET = tst_qmltests
+include(../tests.pri)
+
CONFIG += warn_on testcase
-SOURCES += tst_qmltests.cpp
-QT += declarative qmltest widgets
+QT -= testlib
+QT += qmltest
# QML files tested are the ones in WebKit source repository.
DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp (98982 => 98983)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-11-01 18:30:46 UTC (rev 98983)
@@ -17,11 +17,13 @@
Boston, MA 02110-1301, USA.
*/
+#include "../util.h"
#include <QtQuickTest/quicktest.h>
#include <QtWidgets/QApplication>
int main(int argc, char** argv)
{
+ suppressDebugOutput();
// Instantiate QApplication to prevent quick_test_main to instantiate a QGuiApplication.
// This can be removed as soon as we do not use QtWidgets any more.
QApplication app(argc, argv);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp (98982 => 98983)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qtouchwebview/tst_qtouchwebview.cpp 2011-11-01 18:30:46 UTC (rev 98983)
@@ -84,7 +84,7 @@
}
-QTEST_MAIN(tst_QTouchWebView)
+QTWEBKIT_API_TEST_MAIN(tst_QTouchWebView)
#include "tst_qtouchwebview.moc"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp (98982 => 98983)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp 2011-11-01 18:30:46 UTC (rev 98983)
@@ -18,6 +18,7 @@
*/
#include "util.h"
+#include <stdio.h>
void addQtWebProcessToPath()
{
@@ -49,3 +50,18 @@
return timeoutSpy.isEmpty();
}
+static void messageHandler(QtMsgType type, const char* message)
+{
+ if (type == QtCriticalMsg) {
+ fprintf(stderr, "%s\n", message);
+ return;
+ }
+ // Do nothing
+}
+
+void suppressDebugOutput()
+{
+ qInstallMsgHandler(messageHandler); \
+ if (qgetenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT").isEmpty()) \
+ qputenv("QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT", "1");
+}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (98982 => 98983)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-11-01 18:30:37 UTC (rev 98982)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-11-01 18:30:46 UTC (rev 98983)
@@ -28,3 +28,14 @@
void addQtWebProcessToPath();
bool waitForSignal(QObject*, const char* signal, int timeout = 10000);
+void suppressDebugOutput();
+
+#define QTWEBKIT_API_TEST_MAIN(TestObject) \
+int main(int argc, char** argv) \
+{ \
+ suppressDebugOutput(); \
+ QApplication app(argc, argv); \
+ QTEST_DISABLE_KEYPAD_NAVIGATION \
+ TestObject tc; \
+ return QTest::qExec(&tc, argc, argv); \
+}
