Changeset 69401 in webkit
- Timestamp:
- Oct 8, 2010 8:26:57 AM (13 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r69395 r69401 1 2010-10-08 Balazs Kelemen <kbalazs@webkit.org> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] TestController needs its platform dependent methods 6 https://bugs.webkit.org/show_bug.cgi?id=47413 7 8 * WebKitTestRunner/qt/TestControllerQt.cpp: 9 (WTR::TestController::initializeInjectedBundlePath): 10 If the WTR_INJECTEDBUNDLE_PATH environmental variable is 11 set then use that otherwise use the path where the bundle 12 lives in a normal trunk build. 13 (WTR::TestController::initializeTestPluginDirectory): 14 Set the bundle's value. It is not used currently. 15 (WTR::TestController::platformInitializeContext): 16 * WebKitTestRunner/qt/WebKitTestRunner.pro: 17 1 18 2010-10-08 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> 2 19 -
trunk/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
r69308 r69401 27 27 #include "TestController.h" 28 28 29 #include "NotImplemented.h"29 #include <cstdlib> 30 30 #include <QCoreApplication> 31 31 #include <QEventLoop> 32 #include <QFileInfo> 33 #include <QLibrary> 32 34 #include <QObject> 35 #include <QtGlobal> 36 #include <wtf/text/WTFString.h> 33 37 34 38 namespace WTR { … … 83 87 void TestController::initializeInjectedBundlePath() 84 88 { 85 notImplemented(); 89 QString path = QLatin1String(getenv("WTR_INJECTEDBUNDLE_PATH")); 90 if (path.isEmpty()) 91 path = QFileInfo(QCoreApplication::applicationDirPath() + "/../lib/libWTRInjectedBundle").absoluteFilePath(); 92 93 if (QLibrary::isLibrary(QLibrary(path).fileName())) 94 qFatal("Cannot find the injected bundle at %s\n", qPrintable(path)); 95 96 m_injectedBundlePath = WKStringCreateWithQString(path); 86 97 } 87 98 88 99 void TestController::initializeTestPluginDirectory() 89 100 { 90 notImplemented(); 101 // This is called after initializeInjectedBundlePath. 102 m_testPluginDirectory = m_injectedBundlePath; 91 103 } 92 104 93 105 void TestController::platformInitializeContext() 94 106 { 95 notImplemented();96 107 } 97 108 -
trunk/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
r69248 r69401 21 21 $$BASEDIR/../../WebKit2/Shared \ 22 22 $$BASEDIR/../../WebKit2/UIProcess/API/qt \ 23 $$BASEDIR/../../WebKit2/UIProcess/API/cpp/qt \ 23 24 24 25 INCLUDEPATH += \
Note: See TracChangeset
for help on using the changeset viewer.