Title: [122944] trunk/Tools
- Revision
- 122944
- Author
- [email protected]
- Date
- 2012-07-18 04:25:54 -0700 (Wed, 18 Jul 2012)
Log Message
[Qt] plugin tests should not be disabled for WebKit1
https://bugs.webkit.org/show_bug.cgi?id=91604
Patch by Balazs Kelemen <[email protected]> on 2012-07-18
Reviewed by Simon Hausmann.
Instead of not building TestNetscapePlugIn, we could programatically
disable actually loading it from WTR until https://bugs.webkit.org/show_bug.cgi?id=86620
has been solved, so we can still test plugins on WebKit1.
* Tools.pro:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
* WebKitTestRunner/qt/TestControllerQt.cpp:
(WTR::TestController::initializeTestPluginDirectory):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (122943 => 122944)
--- trunk/Tools/ChangeLog 2012-07-18 11:15:41 UTC (rev 122943)
+++ trunk/Tools/ChangeLog 2012-07-18 11:25:54 UTC (rev 122944)
@@ -1,3 +1,20 @@
+2012-07-18 Balazs Kelemen <[email protected]>
+
+ [Qt] plugin tests should not be disabled for WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=91604
+
+ Reviewed by Simon Hausmann.
+
+ Instead of not building TestNetscapePlugIn, we could programatically
+ disable actually loading it from WTR until https://bugs.webkit.org/show_bug.cgi?id=86620
+ has been solved, so we can still test plugins on WebKit1.
+
+ * Tools.pro:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+ * WebKitTestRunner/qt/TestControllerQt.cpp:
+ (WTR::TestController::initializeTestPluginDirectory):
+
2012-07-18 Mario Sanchez Prada <[email protected]>
[WK2][GTK] Implement AccessibilityUIElement in WKTR for GTK
Modified: trunk/Tools/Tools.pro (122943 => 122944)
--- trunk/Tools/Tools.pro 2012-07-18 11:15:41 UTC (rev 122943)
+++ trunk/Tools/Tools.pro 2012-07-18 11:25:54 UTC (rev 122944)
@@ -21,13 +21,8 @@
SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
}
-# FIXME: with Qt 5 the test plugin cause some trouble during layout tests.
-# See: https://bugs.webkit.org/show_bug.cgi?id=86620
-# Reenable it after we have a fix for this issue.
-!haveQt(5) {
- !win32:contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
- SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
- }
+!win32:contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
+ SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
}
OTHER_FILES = \
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (122943 => 122944)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2012-07-18 11:15:41 UTC (rev 122943)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2012-07-18 11:25:54 UTC (rev 122944)
@@ -324,7 +324,8 @@
};
WKContextSetInjectedBundleClient(m_context.get(), &injectedBundleClient);
- WKContextSetAdditionalPluginsDirectory(m_context.get(), testPluginDirectory());
+ if (testPluginDirectory())
+ WKContextSetAdditionalPluginsDirectory(m_context.get(), testPluginDirectory());
m_mainWebView = adoptPtr(new PlatformWebView(m_context.get(), m_pageGroup.get()));
Modified: trunk/Tools/WebKitTestRunner/qt/TestControllerQt.cpp (122943 => 122944)
--- trunk/Tools/WebKitTestRunner/qt/TestControllerQt.cpp 2012-07-18 11:15:41 UTC (rev 122943)
+++ trunk/Tools/WebKitTestRunner/qt/TestControllerQt.cpp 2012-07-18 11:25:54 UTC (rev 122944)
@@ -104,7 +104,10 @@
void TestController::initializeTestPluginDirectory()
{
- m_testPluginDirectory = WKStringCreateWithUTF8CString(qgetenv("QTWEBKIT_PLUGIN_PATH").constData());
+ // FIXME: the test plugin cause some trouble for us, so we don't load it for the time being.
+ // See: https://bugs.webkit.org/show_bug.cgi?id=86620
+
+ // m_testPluginDirectory = WKStringCreateWithUTF8CString(qgetenv("QTWEBKIT_PLUGIN_PATH").constData());
}
void TestController::platformInitializeContext()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
