Changeset 142070 in webkit


Ignore:
Timestamp:
Feb 7, 2013 12:25:14 AM (11 years ago)
Author:
Simon Hausmann
Message:

[Qt] Compile WTF tests of TestWebKitAPI
​https://bugs.webkit.org/show_bug.cgi?id=108935

Reviewed by Kenneth Rohde Christiansen.

.:

Build gtest on Linux.

  • WebKit.pro:

Source/ThirdParty:

Add qmake build system .pro file for building gtest as static library.

  • gtest/gtest.pro: Added.

Tools:

Add initial stubs and files for building at least the WTF tests.
The WK2 tests need more platform code, in particular PlatformWebView
and injected bundle support.

  • TestWebKitAPI/TestWebKitAPI.pri: Added.
  • TestWebKitAPI/TestWebKitAPI.pro: Added.
  • TestWebKitAPI/Tests/WTF/WTF.pro: Added.
  • TestWebKitAPI/qt/InjectedBundleControllerQt.cpp: Added.

(TestWebKitAPI):
(TestWebKitAPI::InjectedBundleController::platformInitialize):

  • TestWebKitAPI/qt/PlatformUtilitiesQt.cpp: Added.

(Util):
(TestWebKitAPI::Util::run):
(TestWebKitAPI::Util::sleep):
(TestWebKitAPI::Util::createInjectedBundlePath):
(TestWebKitAPI::Util::createURLForResource):
(TestWebKitAPI::Util::URLForNonExistentResource):

  • TestWebKitAPI/qt/main.cpp: Added.

(main):

  • Tools.pro:
  • qmake/mkspecs/features/default_post.prf:
Location:
trunk
Files:
8 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r142005 r142070  
     12013-02-05  Simon Hausmann  <simon.hausmann@digia.com>
     2
     3        [Qt] Compile WTF tests of TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=108935
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Build gtest on Linux.
     9
     10        * WebKit.pro:
     11
    1122013-02-06  Jonathon Jongsma  <jonathon.jongsma@collabora.com>
    213

  • trunk/Source/ThirdParty/ChangeLog

    r141959 r142070  
     12013-02-05  Simon Hausmann  <simon.hausmann@digia.com>
     2
     3        [Qt] Compile WTF tests of TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=108935
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Add qmake build system .pro file for building gtest as static library.
     9
     10        * gtest/gtest.pro: Added.
     11
    1122013-02-05  Paweł Forysiuk  <tuxator@o2.pl>
    213

  • trunk/Tools/ChangeLog

    r142059 r142070  
     12013-02-05  Simon Hausmann  <simon.hausmann@digia.com>
     2
     3        [Qt] Compile WTF tests of TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=108935
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Add initial stubs and files for building at least the WTF tests.
     9        The WK2 tests need more platform code, in particular PlatformWebView
     10        and injected bundle support.
     11
     12        * TestWebKitAPI/TestWebKitAPI.pri: Added.
     13        * TestWebKitAPI/TestWebKitAPI.pro: Added.
     14        * TestWebKitAPI/Tests/WTF/WTF.pro: Added.
     15        * TestWebKitAPI/qt/InjectedBundleControllerQt.cpp: Added.
     16        (TestWebKitAPI):
     17        (TestWebKitAPI::InjectedBundleController::platformInitialize):
     18        * TestWebKitAPI/qt/PlatformUtilitiesQt.cpp: Added.
     19        (Util):
     20        (TestWebKitAPI::Util::run):
     21        (TestWebKitAPI::Util::sleep):
     22        (TestWebKitAPI::Util::createInjectedBundlePath):
     23        (TestWebKitAPI::Util::createURLForResource):
     24        (TestWebKitAPI::Util::URLForNonExistentResource):
     25        * TestWebKitAPI/qt/main.cpp: Added.
     26        (main):
     27        * Tools.pro:
     28        * qmake/mkspecs/features/default_post.prf:
     29
    1302013-02-06  Roger Fong  <roger_fong@apple.com>
    231

  • trunk/Tools/Tools.pro

    r138253 r142070  
    2020        have?(QTQUICK): SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
    2121        SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
     22    }
     23
     24    !production_build {
     25        # Only tested on Linux so far.
     26        linux* {
     27            SUBDIRS += TestWebKitAPI
     28        }
    2229    }
    2330}

  • trunk/Tools/qmake/mkspecs/features/default_post.prf

    r141467 r142070  
    5252CONFIG -= warn_on
    5353
    54 *-g++*: QMAKE_CXXFLAGS = \
     54!compiling_thirdparty_code:*-g++*: QMAKE_CXXFLAGS = \
    5555    -Wall \
    5656    -Wextra \

  • trunk/WebKit.pro

    r136243 r142070  
    4545SUBDIRS += QtWebKit
    4646
     47!production_build {
     48    # Only tested on Linux so far.
     49    linux* {
     50        gtest.file = Source/ThirdParty/gtest/gtest.pro
     51        gtest.makefile = Makefile.gtest
     52        SUBDIRS += gtest
     53    }
     54}
     55
    4756Tools.file = Tools/Tools.pro
    4857Tools.makefile = Makefile.Tools
Note: See TracChangeset for help on using the changeset viewer.