Changeset 69401 in webkit


Ignore:
Timestamp:
Oct 8, 2010 8:26:57 AM (13 years ago)
Author:
kbalazs@webkit.org
Message:

2010-10-08 Balazs Kelemen <kbalazs@webkit.org>

Reviewed by Andreas Kling.

[Qt] TestController needs its platform dependent methods
https://bugs.webkit.org/show_bug.cgi?id=47413

  • WebKitTestRunner/qt/TestControllerQt.cpp: (WTR::TestController::initializeInjectedBundlePath): If the WTR_INJECTEDBUNDLE_PATH environmental variable is set then use that otherwise use the path where the bundle lives in a normal trunk build. (WTR::TestController::initializeTestPluginDirectory): Set the bundle's value. It is not used currently. (WTR::TestController::platformInitializeContext):
  • WebKitTestRunner/qt/WebKitTestRunner.pro:
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r69395 r69401  
     12010-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
    1182010-10-08  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    219
  • trunk/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp

    r69308 r69401  
    2727#include "TestController.h"
    2828
    29 #include "NotImplemented.h"
     29#include <cstdlib>
    3030#include <QCoreApplication>
    3131#include <QEventLoop>
     32#include <QFileInfo>
     33#include <QLibrary>
    3234#include <QObject>
     35#include <QtGlobal>
     36#include <wtf/text/WTFString.h>
    3337
    3438namespace WTR {
     
    8387void TestController::initializeInjectedBundlePath()
    8488{
    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);
    8697}
    8798
    8899void TestController::initializeTestPluginDirectory()
    89100{
    90     notImplemented();
     101    // This is called after initializeInjectedBundlePath.
     102    m_testPluginDirectory = m_injectedBundlePath;
    91103}
    92104
    93105void TestController::platformInitializeContext()
    94106{
    95     notImplemented();
    96107}
    97108
  • trunk/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro

    r69248 r69401  
    2121    $$BASEDIR/../../WebKit2/Shared \
    2222    $$BASEDIR/../../WebKit2/UIProcess/API/qt \
     23    $$BASEDIR/../../WebKit2/UIProcess/API/cpp/qt \
    2324
    2425INCLUDEPATH += \
Note: See TracChangeset for help on using the changeset viewer.