Changeset 161366 in webkit


Ignore:
Timestamp:
Jan 6, 2014 1:14:30 PM (10 years ago)
Author:
Martin Robinson
Message:

[GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
​https://bugs.webkit.org/show_bug.cgi?id=126342

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2014-01-04
Reviewed by Gustavo Noronha Silva.

.:

  • GNUmakefile.am: Remove unused variable.
  • Source/PlatformGTK.cmake: No longer include the old unit tests directories.

Source/WebKit/gtk:

  • tests/CMakeLists.txt: Removed.
  • tests/GNUmakefile.am: Removed.

Source/WebKit2:

  • UIProcess/API/gtk/tests/CMakeLists.txt: Removed.
  • UIProcess/API/gtk/tests/GNUmakefile.am: Removed.

Tools:

  • CMakeLists.txt: Include the new unit tests subdirectories.
  • Scripts/run-gtk-tests: Update to refer to the new build locations.
  • Scripts/webkitpy/style/checker.py: Update the style checker.
  • Scripts/webkitpy/style/checker_unittest.py:
  • TestWebKitAPI/GNUmakefile.am:
  • TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Added.
  • TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp: Added.
  • TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/FrameTest.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp: Added.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestMain.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestMain.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.h.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.h.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp.
  • TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h.
  • TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js.
  • TestWebKitAPI/Tests/WebKit2Gtk/resources/test-cert.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-cert.pem.
  • TestWebKitAPI/Tests/WebKit2Gtk/resources/test-key.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-key.pem.
  • TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml.
  • TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt: Added.
  • TestWebKitAPI/Tests/WebKitGtk/resources/blank.ico: Renamed from Source/WebKit/gtk/tests/resources/blank.ico.
  • TestWebKitAPI/Tests/WebKitGtk/resources/test.html: Renamed from Source/WebKit/gtk/tests/resources/test.html.
  • TestWebKitAPI/Tests/WebKitGtk/resources/test.ogg: Renamed from Source/WebKit/gtk/tests/resources/test.ogg.
  • TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf: Renamed from Source/WebKit/gtk/tests/resources/test.pdf.
  • TestWebKitAPI/Tests/WebKitGtk/resources/test.txt: Renamed from Source/WebKit/gtk/tests/resources/test.txt.
  • TestWebKitAPI/Tests/WebKitGtk/test_utils.c: Renamed from Source/WebKit/gtk/tests/test_utils.c.
  • TestWebKitAPI/Tests/WebKitGtk/test_utils.h: Renamed from Source/WebKit/gtk/tests/test_utils.h.
  • TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c: Renamed from Source/WebKit/gtk/tests/testapplicationcache.c.
  • TestWebKitAPI/Tests/WebKitGtk/testatk.c: Renamed from Source/WebKit/gtk/tests/testatk.c.
  • TestWebKitAPI/Tests/WebKitGtk/testatkroles.c: Renamed from Source/WebKit/gtk/tests/testatkroles.c.
  • TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c: Renamed from Source/WebKit/gtk/tests/testcontextmenu.c.
  • TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c: Renamed from Source/WebKit/gtk/tests/testcopyandpaste.c.
  • TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c: Renamed from Source/WebKit/gtk/tests/testdomdocument.c.
  • TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c: Renamed from Source/WebKit/gtk/tests/testdomdomwindow.c.
  • TestWebKitAPI/Tests/WebKitGtk/testdomnode.c: Renamed from Source/WebKit/gtk/tests/testdomnode.c.
  • TestWebKitAPI/Tests/WebKitGtk/testdownload.c: Renamed from Source/WebKit/gtk/tests/testdownload.c.
  • TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c: Renamed from Source/WebKit/gtk/tests/testfavicondatabase.c.
  • TestWebKitAPI/Tests/WebKitGtk/testglobals.c: Renamed from Source/WebKit/gtk/tests/testglobals.c.
  • TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c: Renamed from Source/WebKit/gtk/tests/testhittestresult.c.
  • TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c: Renamed from Source/WebKit/gtk/tests/testhttpbackend.c.
  • TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c: Renamed from Source/WebKit/gtk/tests/testkeyevents.c.
  • TestWebKitAPI/Tests/WebKitGtk/testloading.c: Renamed from Source/WebKit/gtk/tests/testloading.c.
  • TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c: Renamed from Source/WebKit/gtk/tests/testmimehandling.c.
  • TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c: Renamed from Source/WebKit/gtk/tests/testnetworkrequest.c.
  • TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c: Renamed from Source/WebKit/gtk/tests/testnetworkresponse.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c: Renamed from Source/WebKit/gtk/tests/testwebbackforwardlist.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c: Renamed from Source/WebKit/gtk/tests/testwebdatasource.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebframe.c: Renamed from Source/WebKit/gtk/tests/testwebframe.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c: Renamed from Source/WebKit/gtk/tests/testwebhistoryitem.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c: Renamed from Source/WebKit/gtk/tests/testwebinspector.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c: Renamed from Source/WebKit/gtk/tests/testwebplugindatabase.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebresource.c: Renamed from Source/WebKit/gtk/tests/testwebresource.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c: Renamed from Source/WebKit/gtk/tests/testwebsettings.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwebview.c: Renamed from Source/WebKit/gtk/tests/testwebview.c.
  • TestWebKitAPI/Tests/WebKitGtk/testwindow.c: Renamed from Source/WebKit/gtk/tests/testwindow.c.
Location:
trunk
Files:
7 added
2 deleted
11 edited
85 copied

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r161359 r161366  
     12014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=126342
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: Remove unused variable.
     9        * Source/PlatformGTK.cmake: No longer include the old unit tests directories.
     10
    1112014-01-06  Zan Dobersek  <zdobersek@igalia.com>
    212

  • trunk/GNUmakefile.am

    r161322 r161366  
    6060lib_LTLIBRARIES :=
    6161IDL_BINDINGS :=
    62 TEST_PROGS :=
    6362POFILES :=
    6463PO_LINGUAS :=
    … …  
    215214
    216215if ENABLE_DEVELOPER_MODE
    217 include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
    218 include Source/WebKit/gtk/tests/GNUmakefile.am
    219216include Source/ThirdParty/gtest/GNUmakefile.am
    220217include Tools/GNUmakefile.am

  • trunk/Source/PlatformGTK.cmake

    r161325 r161366  
    33# This allows exposing a 'gir' target which builds all GObject introspection files.
    44add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
    5 
    6 if (ENABLE_API_TESTS)
    7     if (ENABLE_WEBKIT)
    8         add_subdirectory(${WEBKIT_DIR}/gtk/tests)
    9     endif ()
    10     if (ENABLE_WEBKIT2)
    11         add_subdirectory(${WEBKIT2_DIR}/UIProcess/API/gtk/tests)
    12     endif ()
    13 endif ()
    145
    156set(DocumentationDependencies

  • trunk/Source/WebKit/gtk/ChangeLog

    r161338 r161366  
     12014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=126342
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * tests/CMakeLists.txt: Removed.
     9        * tests/GNUmakefile.am: Removed.
     10
    1112014-01-06  László Langó  <lango@inf.u-szeged.hu>
    212

  • trunk/Source/WebKit2/ChangeLog

    r161358 r161366  
     12014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=126342
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * UIProcess/API/gtk/tests/CMakeLists.txt: Removed.
     9        * UIProcess/API/gtk/tests/GNUmakefile.am: Removed.
     10
    1112014-01-06  Enrica Casucci  <enrica@apple.com>
    212

  • trunk/Tools/CMakeLists.txt

    r160938 r161366  
    2020    if (ENABLE_WEBKIT2)
    2121        add_subdirectory(MiniBrowser/gtk)
     22        add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
    2223    endif ()
    2324    if (ENABLE_WEBKIT)
    2425        add_subdirectory(GtkLauncher)
    2526        add_subdirectory(DumpRenderTree)
     27        add_subdirectory(TestWebKitAPI/Tests/WebKitGtk)
    2628    endif ()
    2729    add_subdirectory(DumpRenderTree/TestNetscapePlugIn)

  • trunk/Tools/ChangeLog

    r161363 r161366  
     12014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
     4        https://bugs.webkit.org/show_bug.cgi?id=126342
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * CMakeLists.txt: Include the new unit tests subdirectories.
     9        * Scripts/run-gtk-tests: Update to refer to the new build locations.
     10        * Scripts/webkitpy/style/checker.py: Update the style checker.
     11        * Scripts/webkitpy/style/checker_unittest.py:
     12        * TestWebKitAPI/GNUmakefile.am:
     13        * TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp.
     14        * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Added.
     15        * TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp: Added.
     16        * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp.
     17        * TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/FrameTest.cpp.
     18        * TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp.
     19        * TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp.
     20        * TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h.
     21        * TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp.
     22        * TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp.
     23        * TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp.
     24        * TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp.
     25        * TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp: Added.
     26        * TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp.
     27        * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp.
     28        * TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp.
     29        * TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp.
     30        * TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp.
     31        * TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp.
     32        * TestWebKitAPI/Tests/WebKit2Gtk/TestMain.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp.
     33        * TestWebKitAPI/Tests/WebKit2Gtk/TestMain.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h.
     34        * TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp.
     35        * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp.
     36        * TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp.
     37        * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp.
     38        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp.
     39        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp.
     40        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp.
     41        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp.
     42        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp.
     43        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp.
     44        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp.
     45        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp.
     46        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp.
     47        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp.
     48        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp.
     49        * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp.
     50        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp.
     51        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h.
     52        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp.
     53        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h.
     54        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.cpp.
     55        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.h.
     56        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.cpp.
     57        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.h.
     58        * TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp.
     59        * TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h.
     60        * TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js.
     61        * TestWebKitAPI/Tests/WebKit2Gtk/resources/test-cert.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-cert.pem.
     62        * TestWebKitAPI/Tests/WebKit2Gtk/resources/test-key.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-key.pem.
     63        * TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml.
     64        * TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt: Added.
     65        * TestWebKitAPI/Tests/WebKitGtk/resources/blank.ico: Renamed from Source/WebKit/gtk/tests/resources/blank.ico.
     66        * TestWebKitAPI/Tests/WebKitGtk/resources/test.html: Renamed from Source/WebKit/gtk/tests/resources/test.html.
     67        * TestWebKitAPI/Tests/WebKitGtk/resources/test.ogg: Renamed from Source/WebKit/gtk/tests/resources/test.ogg.
     68        * TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf: Renamed from Source/WebKit/gtk/tests/resources/test.pdf.
     69        * TestWebKitAPI/Tests/WebKitGtk/resources/test.txt: Renamed from Source/WebKit/gtk/tests/resources/test.txt.
     70        * TestWebKitAPI/Tests/WebKitGtk/test_utils.c: Renamed from Source/WebKit/gtk/tests/test_utils.c.
     71        * TestWebKitAPI/Tests/WebKitGtk/test_utils.h: Renamed from Source/WebKit/gtk/tests/test_utils.h.
     72        * TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c: Renamed from Source/WebKit/gtk/tests/testapplicationcache.c.
     73        * TestWebKitAPI/Tests/WebKitGtk/testatk.c: Renamed from Source/WebKit/gtk/tests/testatk.c.
     74        * TestWebKitAPI/Tests/WebKitGtk/testatkroles.c: Renamed from Source/WebKit/gtk/tests/testatkroles.c.
     75        * TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c: Renamed from Source/WebKit/gtk/tests/testcontextmenu.c.
     76        * TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c: Renamed from Source/WebKit/gtk/tests/testcopyandpaste.c.
     77        * TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c: Renamed from Source/WebKit/gtk/tests/testdomdocument.c.
     78        * TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c: Renamed from Source/WebKit/gtk/tests/testdomdomwindow.c.
     79        * TestWebKitAPI/Tests/WebKitGtk/testdomnode.c: Renamed from Source/WebKit/gtk/tests/testdomnode.c.
     80        * TestWebKitAPI/Tests/WebKitGtk/testdownload.c: Renamed from Source/WebKit/gtk/tests/testdownload.c.
     81        * TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c: Renamed from Source/WebKit/gtk/tests/testfavicondatabase.c.
     82        * TestWebKitAPI/Tests/WebKitGtk/testglobals.c: Renamed from Source/WebKit/gtk/tests/testglobals.c.
     83        * TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c: Renamed from Source/WebKit/gtk/tests/testhittestresult.c.
     84        * TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c: Renamed from Source/WebKit/gtk/tests/testhttpbackend.c.
     85        * TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c: Renamed from Source/WebKit/gtk/tests/testkeyevents.c.
     86        * TestWebKitAPI/Tests/WebKitGtk/testloading.c: Renamed from Source/WebKit/gtk/tests/testloading.c.
     87        * TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c: Renamed from Source/WebKit/gtk/tests/testmimehandling.c.
     88        * TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c: Renamed from Source/WebKit/gtk/tests/testnetworkrequest.c.
     89        * TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c: Renamed from Source/WebKit/gtk/tests/testnetworkresponse.c.
     90        * TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c: Renamed from Source/WebKit/gtk/tests/testwebbackforwardlist.c.
     91        * TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c: Renamed from Source/WebKit/gtk/tests/testwebdatasource.c.
     92        * TestWebKitAPI/Tests/WebKitGtk/testwebframe.c: Renamed from Source/WebKit/gtk/tests/testwebframe.c.
     93        * TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c: Renamed from Source/WebKit/gtk/tests/testwebhistoryitem.c.
     94        * TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c: Renamed from Source/WebKit/gtk/tests/testwebinspector.c.
     95        * TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c: Renamed from Source/WebKit/gtk/tests/testwebplugindatabase.c.
     96        * TestWebKitAPI/Tests/WebKitGtk/testwebresource.c: Renamed from Source/WebKit/gtk/tests/testwebresource.c.
     97        * TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c: Renamed from Source/WebKit/gtk/tests/testwebsettings.c.
     98        * TestWebKitAPI/Tests/WebKitGtk/testwebview.c: Renamed from Source/WebKit/gtk/tests/testwebview.c.
     99        * TestWebKitAPI/Tests/WebKitGtk/testwindow.c: Renamed from Source/WebKit/gtk/tests/testwindow.c.
     100
    11012014-01-06  Alexey Proskuryakov  <ap@apple.com>
    2102

  • trunk/Tools/Scripts/run-gtk-tests

    r161268 r161366  
    5959
    6060class TestRunner:
    61     TEST_DIRS = [ "WebKit1GObjectAPITests", "WebKit2GObjectAPITests", "TestWebKitAPI" ]
     61    TEST_DIRS = [ "WebKit2Gtk", "WebKitGtk", "WebKit2", "JavaScriptCore", "WTF", "WebCore",  "WebCoreGtk" ]
    6262
    6363    SKIPPED = [
    64         SkippedTest("WebKit1GObjectAPITests/testdownload", "/webkit/download/not-found", "Test fails in GTK Linux 64-bit Release bot", 82329),
    65         SkippedTest("WebKit1GObjectAPITests/testwebinspector", "/webkit/webinspector/close-and-inspect", "Test is flaky in GTK Linux 32-bit Release bot", 82869),
    66         SkippedTest("WebKit1GObjectAPITests/testwebresource", "/webkit/webresource/loading", "Test fails", 104689),
    67         SkippedTest("WebKit1GObjectAPITests/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
    68         SkippedTest("WebKit1GObjectAPITests/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
    69         SkippedTest("WebKit2GObjectAPITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
    70         SkippedTest("WebKit2GObjectAPITests/TestUIClient", "/webkit2/WebKitWebView/mouse-target", "Test times out after r150890", 117689),
    71         SkippedTest("WebKit2GObjectAPITests/TestAuthentication", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
    72         SkippedTest("WebKit2GObjectAPITests/TestContextMenu", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
    73         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
    74         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),
    75         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutFrames", "Test fails", 85037),
    76         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.RestoreSessionStateContainingFormData", "Session State is not implemented in GTK+ port", 84960),
    77         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.SpacebarScrolling", "Test fails", 84961),
    78         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.WKConnection", "Tests fail and time out out", 84959),
    79         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.WKPageGetScaleFactorNotZero", "Test fails and times out", 88455),
    80         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ForceRepaint", "Test times out", 105532),
    81         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ReloadPageAfterCrash", "Test flakily times out", 110129),
    82         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.DidAssociateFormControls", "Test times out", 120302),
    83         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.InjectedBundleFrameHitTest", "Test times out", 120303),
    84         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ResizeReversePaginatedWebView", "Test fails", 120305),
    85         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ScrollPinningBehaviors", "Test fails", 120306),
    86         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.TerminateTwice", "Test causes crash on the next test", 121970),
    87         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068),
    88         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
    89         SkippedTest("WebKit2GObjectAPITests/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),
     64        SkippedTest("WebKitGtk/testdownload", "/webkit/download/not-found", "Test fails in GTK Linux 64-bit Release bot", 82329),
     65        SkippedTest("WebKitGtk/testwebinspector", "/webkit/webinspector/close-and-inspect", "Test is flaky in GTK Linux 32-bit Release bot", 82869),
     66        SkippedTest("WebKitGtk/testwebresource", "/webkit/webresource/loading", "Test fails", 104689),
     67        SkippedTest("WebKitGtk/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
     68        SkippedTest("WebKitGtk/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
     69        SkippedTest("WebKit2Gtk/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
     70        SkippedTest("WebKit2Gtk/TestUIClient", "/webkit2/WebKitWebView/mouse-target", "Test times out after r150890", 117689),
     71        SkippedTest("WebKit2Gtk/TestAuthentication", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
     72        SkippedTest("WebKit2Gtk/TestContextMenu", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
     73        SkippedTest("WebKit2/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
     74        SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),
     75        SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutFrames", "Test fails", 85037),
     76        SkippedTest("WebKit2/TestWebKit2", "WebKit2.RestoreSessionStateContainingFormData", "Session State is not implemented in GTK+ port", 84960),
     77        SkippedTest("WebKit2/TestWebKit2", "WebKit2.SpacebarScrolling", "Test fails", 84961),
     78        SkippedTest("WebKit2/TestWebKit2", "WebKit2.WKConnection", "Tests fail and time out out", 84959),
     79        SkippedTest("WebKit2/TestWebKit2", "WebKit2.WKPageGetScaleFactorNotZero", "Test fails and times out", 88455),
     80        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ForceRepaint", "Test times out", 105532),
     81        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ReloadPageAfterCrash", "Test flakily times out", 110129),
     82        SkippedTest("WebKit2/TestWebKit2", "WebKit2.DidAssociateFormControls", "Test times out", 120302),
     83        SkippedTest("WebKit2/TestWebKit2", "WebKit2.InjectedBundleFrameHitTest", "Test times out", 120303),
     84        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ResizeReversePaginatedWebView", "Test fails", 120305),
     85        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ScrollPinningBehaviors", "Test fails", 120306),
     86        SkippedTest("WebKit2/TestWebKit2", "WebKit2.TerminateTwice", "Test causes crash on the next test", 121970),
     87        SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068),
     88        SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
     89        SkippedTest("WebKit2Gtk/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),
    9090    ]
    9191
    … …  
    106106        self._spi_registryd = None
    107107        self._spi_bus_launcher = None
     108
     109    def _test_programs_base_dir(self):
     110        return os.path.join(self._programs_path, "TestWebKitAPI")
    108111
    109112    def _get_tests_from_dir(self, test_dir):
    … …  
    132135        tests = []
    133136        for test_dir in self.TEST_DIRS:
    134             absolute_test_dir = os.path.join(self._programs_path, test_dir)
     137            absolute_test_dir = os.path.join(self._test_programs_base_dir(), test_dir)
    135138            tests.extend(self._get_tests_from_dir(absolute_test_dir))
    136139        return tests
    … …  
    362365
    363366    def _run_test(self, test_program):
    364         if "GObjectAPITest" in test_program:
     367        basedir = os.path.basename(os.path.dirname(test_program))
     368        if basedir in ["WebKit2Gtk", "WebKitGtk"]:
    365369            return self._run_test_glib(test_program)
    366370
    367         if "TestWebKitAPI" in test_program:
     371        if basedir in ["WebKit2", "JavaScriptCore", "WTF", "WebCore",  "WebCoreGtk"]:
    368372            return self._run_google_test_suite(test_program)
    369373
    … …  
    372376    def run_tests(self):
    373377        if not self._tests:
    374             sys.stderr.write("ERROR: tests not found in %s.\n" % (self._programs_path))
     378            sys.stderr.write("ERROR: tests not found in %s.\n" % (self._test_programs_base_dir()))
    375379            sys.stderr.flush()
    376380            return 1
    … …  
    406410
    407411        if failed_tests:
    408             names = [test.replace(self._programs_path, '', 1) for test in failed_tests]
     412            names = [test.replace(self._test_programs_base_dir(), '', 1) for test in failed_tests]
    409413            sys.stdout.write("Tests failed (%d): %s\n" % (len(names), ", ".join(names)))
    410414            sys.stdout.flush()
    411415
    412416        if crashed_tests:
    413             names = [test.replace(self._programs_path, '', 1) for test in crashed_tests]
     417            names = [test.replace(self._test_programs_base_dir(), '', 1) for test in crashed_tests]
    414418            sys.stdout.write("Tests that crashed (%d): %s\n" % (len(names), ", ".join(names)))
    415419            sys.stdout.flush()
    416420
    417421        if timed_out_tests:
    418             names = [test.replace(self._programs_path, '', 1) for test in timed_out_tests]
     422            names = [test.replace(self._test_programs_base_dir(), '', 1) for test in timed_out_tests]
    419423            sys.stdout.write("Tests that timed out (%d): %s\n" % (len(names), ", ".join(names)))
    420424            sys.stdout.flush()

  • trunk/Tools/Scripts/webkitpy/style/checker.py

    r160611 r161366  
    318318# future merges.
    319319_SKIPPED_FILES_WITH_WARNING = [
    320     "Source/WebKit/gtk/tests/",
     320    "Tools/TestWebKitAPI/Tests/WebKitGtk/",
    321321    # All WebKit*.h files in Source/WebKit2/UIProcess/API/gtk,
    322322    # except those ending in ...Private.h are GTK+ API headers,

  • trunk/Tools/Scripts/webkitpy/style/checker_unittest.py

    r160083 r161366  
    281281        # Check skipped files.
    282282        paths_to_skip = [
    283            "Source/WebKit/gtk/tests/testatk.c",
     283           "Tools/TestWebKitAPI/Tests/WebKitGtk/testatk.c",
    284284           "Source/WebKit2/UIProcess/API/gtk/webkit2.h",
    285285           "Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h",
    … …  
    298298           "Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp",
    299299           "Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h",
    300            "Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp",
    301            "Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h",
     300           "Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.cpp",
     301           "Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.h",
    302302            ]
    303303

  • trunk/Tools/TestWebKitAPI/GNUmakefile.am

    r161255 r161366  
    11noinst_LTLIBRARIES += \
    22        Libraries/libTestWebKitAPIMain.la
     3
     4if ENABLE_WEBKIT2
     5noinst_LTLIBRARIES += \
     6        Libraries/libTestWebKit2GtkAPI.la
     7endif
    38
    49Libraries_libTestWebKitAPIMain_la_SOURCES = \
    … …  
    2126        $(GTK_CFLAGS)
    2227
     28webkitgtk_tests_cflags = \
     29        -fno-strict-aliasing \
     30        -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
     31        -I$(srcdir)/Source/JavaScriptCore/ForwardingHeaders \
     32        -I$(WebKit) \
     33        -I$(GENSOURCES) \
     34        -I$(top_builddir)/Source/WebKit/gtk \
     35        -I$(top_srcdir)/Source/WebCore/bindings \
     36        -I$(top_srcdir)/Source/WebCore/bindings/gobject \
     37        $(global_cppflags) \
     38        $(global_cflags) \
     39        $(javascriptcore_cppflags) \
     40        $(FREETYPE_CFLAGS) \
     41        $(GLIB_CFLAGS) \
     42        $(GTK_CFLAGS) \
     43        $(LIBSOUP_CFLAGS) \
     44        $(XRENDER_CFLAGS) \
     45        $(XT_CFLAGS)
     46
     47webkitgtk_tests_ldadd = \
     48        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     49        libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     50        $(FREETYPE_LIBS) \
     51        $(GTK_LIBS) \
     52        $(GLIB_LIBS) \
     53        $(LIBSOUP_LIBS) \
     54        $(XRENDER_LIBS)
     55
     56webkitgtk_tests_ldflags = \
     57        -no-install
     58
     59
     60webkit2gtk_tests_cppflags = \
     61        -DWEBKIT_EXEC_PATH=\"${shell pwd}/$(top_builddir)/Programs\" \
     62        -DWEBKIT_SRC_DIR=\"${shell pwd}/${srcdir}\" \
     63        -DWEBKIT_DERIVED_SRC_DIR=\"${shell pwd}/${top_builddir}/DerivedSources\" \
     64        -DWEBKIT_TEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
     65        -DWEBKIT_TEST_WEB_EXTENSIONS_DIR=\"${shell pwd}/${top_builddir}/Libraries/WebExtensions/.libs\" \
     66        -DWEBKIT_INJECTED_BUNDLE_PATH=\"${shell pwd}/$(top_builddir)/.libs\" \
     67        $(javascriptcore_cppflags) \
     68        -I$(srcdir)/Source \
     69        -I$(srcdir)/Source/WebKit2 \
     70        -I$(srcdir)/Source/JavaScriptCore \
     71        -I$(srcdir)/Tools/TestWebKitAPI/gtk/WebKit2Gtk \
     72        -I$(top_builddir)/DerivedSources/WebKit2/include \
     73        -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk \
     74        -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk/include \
     75        -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
     76        $(global_cppflags) \
     77        $(FREETYPE_CFLAGS) \
     78        $(GLIB_CFLAGS) \
     79        $(GTK_CFLAGS) \
     80        $(LIBSOUP_CFLAGS)
     81
     82webkit2gtk_tests_ldadd = \
     83        Libraries/libTestWebKit2GtkAPI.la \
     84        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     85        libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     86        $(FREETYPE_LIBS) \
     87        $(GEOCLUE_LIBS) \
     88        $(GLIB_LIBS) \
     89        $(GTK_LIBS) \
     90        $(LIBSOUP_LIBS)
     91
     92webkit2gtk_tests_ldflags = \
     93        -no-install
     94
     95Libraries_libTestWebKit2GtkAPI_la_SOURCES = \
     96        Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp \
     97        Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h \
     98        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp \
     99        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h \
     100        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp \
     101        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h \
     102        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp \
     103        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.h \
     104        Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp \
     105        Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h \
     106        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp \
     107        Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h
     108
     109Libraries_libTestWebKit2GtkAPI_la_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     110
     111
    23112noinst_PROGRAMS += \
    24         Programs/TestWebKitAPI/TestWTF \
    25         Programs/TestWebKitAPI/TestJavaScriptCore \
    26         Programs/TestWebKitAPI/TestWebCore \
    27         Programs/TestWebKitAPI/TestGtk
     113        Programs/TestWebKitAPI/WTF/TestWTF \
     114        Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
     115        Programs/TestWebKitAPI/WebCore/TestWebCore \
     116        Programs/TestWebKitAPI/WebCoreGtk/TestWebCoreGtk
     117
     118if ENABLE_WEBKIT1
     119noinst_PROGRAMS += \
     120        Programs/TestWebKitAPI/WebKitGtk/testapplicationcache \
     121        Programs/TestWebKitAPI/WebKitGtk/testcontextmenu \
     122        Programs/TestWebKitAPI/WebKitGtk/testdomdocument \
     123        Programs/TestWebKitAPI/WebKitGtk/testdomdomwindow \
     124        Programs/TestWebKitAPI/WebKitGtk/testdomnode \
     125        Programs/TestWebKitAPI/WebKitGtk/testhttpbackend \
     126        Programs/TestWebKitAPI/WebKitGtk/testfavicondatabase \
     127        Programs/TestWebKitAPI/WebKitGtk/testloading \
     128        Programs/TestWebKitAPI/WebKitGtk/testglobals \
     129        Programs/TestWebKitAPI/WebKitGtk/testmimehandling \
     130        Programs/TestWebKitAPI/WebKitGtk/testnetworkrequest \
     131        Programs/TestWebKitAPI/WebKitGtk/testnetworkresponse \
     132        Programs/TestWebKitAPI/WebKitGtk/testwebframe \
     133        Programs/TestWebKitAPI/WebKitGtk/testwebbackforwardlist \
     134        Programs/TestWebKitAPI/WebKitGtk/testwebhistoryitem \
     135        Programs/TestWebKitAPI/WebKitGtk/testwindow \
     136        Programs/TestWebKitAPI/WebKitGtk/testdownload \
     137        Programs/TestWebKitAPI/WebKitGtk/testatk \
     138        Programs/TestWebKitAPI/WebKitGtk/testatkroles \
     139        Programs/TestWebKitAPI/WebKitGtk/testhittestresult \
     140        Programs/TestWebKitAPI/WebKitGtk/testwebinspector \
     141        Programs/TestWebKitAPI/WebKitGtk/testwebsettings \
     142        Programs/TestWebKitAPI/WebKitGtk/testwebresource \
     143        Programs/TestWebKitAPI/WebKitGtk/testwebdatasource \
     144        Programs/TestWebKitAPI/WebKitGtk/testwebplugindatabase \
     145        Programs/TestWebKitAPI/WebKitGtk/testwebview \
     146        Programs/TestWebKitAPI/WebKitGtk/testkeyevents \
     147        Programs/TestWebKitAPI/WebKitGtk/testcopyandpaste
     148endif
    28149
    29150if ENABLE_WEBKIT2
    30151noinst_PROGRAMS += \
    31         Programs/TestWebKitAPI/TestWebKit2
     152        Programs/TestWebKitAPI/WebKit2/TestWebKit2 \
     153        Programs/TestWebKitAPI/WebKit2Gtk/InspectorTestServer \
     154        Programs/TestWebKitAPI/WebKit2Gtk/TestAuthentication \
     155        Programs/TestWebKitAPI/WebKit2Gtk/TestBackForwardList \
     156        Programs/TestWebKitAPI/WebKit2Gtk/TestContextMenu \
     157        Programs/TestWebKitAPI/WebKit2Gtk/TestCookieManager \
     158        Programs/TestWebKitAPI/WebKit2Gtk/TestDOMNode \
     159        Programs/TestWebKitAPI/WebKit2Gtk/TestDownloads \
     160        Programs/TestWebKitAPI/WebKit2Gtk/TestFrame \
     161        Programs/TestWebKitAPI/WebKit2Gtk/TestInspector \
     162        Programs/TestWebKitAPI/WebKit2Gtk/TestInspectorServer \
     163        Programs/TestWebKitAPI/WebKit2Gtk/TestLoaderClient \
     164        Programs/TestWebKitAPI/WebKit2Gtk/TestPrinting \
     165        Programs/TestWebKitAPI/WebKit2Gtk/TestResources \
     166        Programs/TestWebKitAPI/WebKit2Gtk/TestSSL \
     167        Programs/TestWebKitAPI/WebKit2Gtk/TestUIClient \
     168        Programs/TestWebKitAPI/WebKit2Gtk/TestWebExtensions \
     169        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitVersion \
     170        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitFaviconDatabase \
     171        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitFindController \
     172        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitPolicyClient \
     173        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitSettings \
     174        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitWebContext \
     175        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitWebView \
     176        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitWebViewGroup \
     177        Programs/TestWebKitAPI/WebKit2Gtk/TestWebViewEditor
     178
     179if HAVE_ATSPI2
     180noinst_PROGRAMS += \
     181        Programs/TestWebKitAPI/WebKit2Gtk/AccessibilityTestServer \
     182        Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitAccessibility
     183endif
    32184endif # ENABLE_WEBKIT2
    33185
    34 Programs_TestWebKitAPI_TestWTF_CPPFLAGS = \
     186Programs_TestWebKitAPI_WTF_TestWTF_CPPFLAGS = \
    35187        $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
    36188        $(GLIB_LIBS) \
    37189        $(CAIRO_CFLAGS)
    38190
    39 Programs_TestWebKitAPI_TestWTF_CXXFLAGS = \
     191Programs_TestWebKitAPI_WTF_TestWTF_CXXFLAGS = \
    40192        -DGTEST_HAS_RTTI=0 \
    41193        $(global_cxxflags)
    42194
    43 Programs_TestWebKitAPI_TestWTF_LDADD = \
     195Programs_TestWebKitAPI_WTF_TestWTF_LDADD = \
    44196        Libraries/libTestWebKitAPIMain.la \
    45197        Libraries/libgtest.la \
    … …  
    48200        $(GLIB_LIBS)
    49201
    50 Programs_TestWebKitAPI_TestWTF_LDFLAGS = \
     202Programs_TestWebKitAPI_WTF_TestWTF_LDFLAGS = \
    51203        -no-install
    52204
    53 Programs_TestWebKitAPI_TestWTF_SOURCES = \
     205Programs_TestWebKitAPI_WTF_TestWTF_SOURCES = \
    54206        Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp \
    55207        Tools/TestWebKitAPI/Tests/WTF/CString.cpp \
    … …  
    79231        Tools/TestWebKitAPI/WTFStringUtilities.h
    80232
    81 Programs_TestWebKitAPI_TestJavaScriptCore_CPPFLAGS = \
     233Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_CPPFLAGS = \
    82234        $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS)
    83235
    84 Programs_TestWebKitAPI_TestJavaScriptCore_CXXFLAGS = \
     236Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_CXXFLAGS = \
    85237        -DGTEST_HAS_RTTI=0 \
    86238        $(global_cxxflags)
    87239
    88 Programs_TestWebKitAPI_TestJavaScriptCore_LDADD = \
     240Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_LDADD = \
    89241        Libraries/libTestWebKitAPIMain.la \
    90242        Libraries/libgtest.la \
    … …  
    92244        $(GTK_LIBS)
    93245
    94 Programs_TestWebKitAPI_TestJavaScriptCore_LDFLAGS = \
     246Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_LDFLAGS = \
    95247        -no-install
    96248
    97 Programs_TestWebKitAPI_TestJavaScriptCore_SOURCES = \
     249Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_SOURCES = \
    98250        Tools/TestWebKitAPI/Tests/JavaScriptCore/VMInspector.cpp
    99251
    … …  
    130282        $(top_builddir)/libWebCoreLayer.a
    131283
    132 Programs_TestWebKitAPI_TestWebCore_CPPFLAGS = \
     284Programs_TestWebKitAPI_WebCore_TestWebCore_CPPFLAGS = \
    133285        $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
    134286        -I$(top_builddir)/DerivedSources/WebCore/include
    135287
    136 Programs_TestWebKitAPI_TestWebCore_CXXFLAGS = \
     288Programs_TestWebKitAPI_WebCore_TestWebCore_CXXFLAGS = \
    137289        -DGTEST_HAS_RTTI=0 \
    138290        $(global_cxxflags)
    139291
    140 Programs_TestWebKitAPI_TestWebCore_LDADD = \
     292Programs_TestWebKitAPI_WebCore_TestWebCore_LDADD = \
    141293        Libraries/libTestWebKitAPIMain.la \
    142294        Libraries/libgtest.la \
    … …  
    165317        $(ZLIB_LIBS)
    166318
    167 Programs_TestWebKitAPI_TestWebCore_LDFLAGS = \
     319Programs_TestWebKitAPI_WebCore_TestWebCore_LDFLAGS = \
    168320        -no-install
    169321
    170 Programs_TestWebKitAPI_TestWebCore_SOURCES = \
     322Programs_TestWebKitAPI_WebCore_TestWebCore_SOURCES = \
    171323        Tools/TestWebKitAPI/Tests/WebCore/URL.cpp \
    172324        Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp
    173325
    174 Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
    175         $(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
     326Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_CPPFLAGS = \
     327        $(Programs_TestWebKitAPI_WTF_TestWTF_CPPFLAGS) \
    176328        $(platform_cppflags) \
    177329        $(platformgtk_cppflags) \
    … …  
    183335        $(LIBSOUP_CFLAGS)
    184336
    185 Programs_TestWebKitAPI_TestGtk_CXXFLAGS = \
     337Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_CXXFLAGS = \
    186338        -DGTEST_HAS_RTTI=0 \
    187339        $(global_cxxflags)
    188340
    189 Programs_TestWebKitAPI_TestGtk_LDADD = \
     341Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_LDADD = \
    190342        Libraries/libTestWebKitAPIMain.la \
    191343        Libraries/libgtest.la \
    … …  
    199351        $(LIBSOUP_LIBS)
    200352
    201 Programs_TestWebKitAPI_TestGtk_LDFLAGS = \
    202         $(Programs_TestWebKitAPI_TestWTF_LDFLAGS)
    203 
    204 Programs_TestWebKitAPI_TestGtk_SOURCES = \
     353Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_LDFLAGS = \
     354        $(Programs_TestWebKitAPI_WTF_TestWTF_LDFLAGS)
     355
     356Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_SOURCES = \
    205357        Source/WebCore/platform/graphics/IntPoint.cpp \
    206358        Source/WebCore/platform/graphics/IntRect.cpp \
    … …  
    212364        Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp
    213365
    214 Programs_TestWebKitAPI_TestWebKit2_CPPFLAGS = \
    215         $(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
     366Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_SOURCES = \
     367        Tools/TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c
     368Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_CFLAGS = $(webkitgtk_tests_cflags)
     369Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_LDADD = $(webkitgtk_tests_ldadd)
     370Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_LDFLAGS = $(webkitgtk_tests_ldflags)
     371
     372Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_SOURCES = \
     373        Tools/TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c
     374Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_CFLAGS = $(webkitgtk_tests_cflags)
     375Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_LDADD = $(webkitgtk_tests_ldadd)
     376Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_LDFLAGS = $(webkitgtk_tests_ldflags)
     377
     378Programs_TestWebKitAPI_WebKitGtk_testdomdocument_SOURCES = \
     379        Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c
     380Programs_TestWebKitAPI_WebKitGtk_testdomdocument_CFLAGS = $(webkitgtk_tests_cflags)
     381Programs_TestWebKitAPI_WebKitGtk_testdomdocument_LDADD = $(webkitgtk_tests_ldadd)
     382Programs_TestWebKitAPI_WebKitGtk_testdomdocument_LDFLAGS = $(webkitgtk_tests_ldflags)
     383
     384Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_SOURCES = \
     385        Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c
     386Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_CFLAGS = $(webkitgtk_tests_cflags)
     387Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_LDADD = $(webkitgtk_tests_ldadd)
     388Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_LDFLAGS = $(webkitgtk_tests_ldflags)
     389
     390Programs_TestWebKitAPI_WebKitGtk_testdomnode_SOURCES = \
     391        Tools/TestWebKitAPI/Tests/WebKitGtk/testdomnode.c
     392Programs_TestWebKitAPI_WebKitGtk_testdomnode_CFLAGS = $(webkitgtk_tests_cflags)
     393Programs_TestWebKitAPI_WebKitGtk_testdomnode_LDADD = $(webkitgtk_tests_ldadd)
     394Programs_TestWebKitAPI_WebKitGtk_testdomnode_LDFLAGS = $(webkitgtk_tests_ldflags)
     395
     396Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_SOURCES = \
     397        Tools/TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c
     398Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_CFLAGS = $(webkitgtk_tests_cflags)
     399Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_LDADD = $(webkitgtk_tests_ldadd)
     400Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_LDFLAGS = $(webkitgtk_tests_ldflags)
     401
     402Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_SOURCES = \
     403        Tools/TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c \
     404        Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
     405Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_CFLAGS = $(webkitgtk_tests_cflags)
     406Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_LDADD = $(webkitgtk_tests_ldadd)
     407Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_LDFLAGS = $(webkitgtk_tests_ldflags)
     408
     409Programs_TestWebKitAPI_WebKitGtk_testglobals_SOURCES = \
     410        Tools/TestWebKitAPI/Tests/WebKitGtk/testglobals.c
     411Programs_TestWebKitAPI_WebKitGtk_testglobals_CFLAGS = $(webkitgtk_tests_cflags)
     412Programs_TestWebKitAPI_WebKitGtk_testglobals_LDADD = $(webkitgtk_tests_ldadd)
     413Programs_TestWebKitAPI_WebKitGtk_testglobals_LDFLAGS = $(webkitgtk_tests_ldflags)
     414
     415Programs_TestWebKitAPI_WebKitGtk_testloading_SOURCES = \
     416        Tools/TestWebKitAPI/Tests/WebKitGtk/testloading.c
     417Programs_TestWebKitAPI_WebKitGtk_testloading_CFLAGS = $(webkitgtk_tests_cflags)
     418Programs_TestWebKitAPI_WebKitGtk_testloading_LDADD = $(webkitgtk_tests_ldadd)
     419Programs_TestWebKitAPI_WebKitGtk_testloading_LDFLAGS = $(webkitgtk_tests_ldflags)
     420
     421Programs_TestWebKitAPI_WebKitGtk_testmimehandling_SOURCES = \
     422        Tools/TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c \
     423        Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
     424Programs_TestWebKitAPI_WebKitGtk_testmimehandling_CFLAGS = $(webkitgtk_tests_cflags)
     425Programs_TestWebKitAPI_WebKitGtk_testmimehandling_LDADD = $(webkitgtk_tests_ldadd)
     426Programs_TestWebKitAPI_WebKitGtk_testmimehandling_LDFLAGS = $(webkitgtk_tests_ldflags)
     427
     428Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_SOURCES = \
     429        Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c
     430Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_CFLAGS = $(webkitgtk_tests_cflags)
     431Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_LDADD = $(webkitgtk_tests_ldadd)
     432Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_LDFLAGS = $(webkitgtk_tests_ldflags)
     433
     434Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_SOURCES = \
     435        Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c
     436Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_CFLAGS = $(webkitgtk_tests_cflags)
     437Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_LDADD = $(webkitgtk_tests_ldadd)
     438Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_LDFLAGS = $(webkitgtk_tests_ldflags)
     439
     440Programs_TestWebKitAPI_WebKitGtk_testwebframe_SOURCES = \
     441        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebframe.c
     442Programs_TestWebKitAPI_WebKitGtk_testwebframe_CFLAGS = $(webkitgtk_tests_cflags)
     443Programs_TestWebKitAPI_WebKitGtk_testwebframe_LDADD = $(webkitgtk_tests_ldadd)
     444Programs_TestWebKitAPI_WebKitGtk_testwebframe_LDFLAGS = $(webkitgtk_tests_ldflags)
     445
     446Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_SOURCES = \
     447        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c
     448Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_CFLAGS = $(webkitgtk_tests_cflags)
     449Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_LDADD = $(webkitgtk_tests_ldadd)
     450Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_LDFLAGS = $(webkitgtk_tests_ldflags)
     451
     452Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_SOURCES = \
     453        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c
     454Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_CFLAGS = $(webkitgtk_tests_cflags)
     455Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_LDADD = $(webkitgtk_tests_ldadd)
     456Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_LDFLAGS = $(webkitgtk_tests_ldflags)
     457
     458Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_SOURCES = \
     459        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c
     460Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_CFLAGS = $(webkitgtk_tests_cflags)
     461Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_LDADD = $(webkitgtk_tests_ldadd)
     462Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_LDFLAGS = $(webkitgtk_tests_ldflags)
     463
     464Programs_TestWebKitAPI_WebKitGtk_testwindow_SOURCES = \
     465        Tools/TestWebKitAPI/Tests/WebKitGtk/testwindow.c
     466Programs_TestWebKitAPI_WebKitGtk_testwindow_CFLAGS = $(webkitgtk_tests_cflags)
     467Programs_TestWebKitAPI_WebKitGtk_testwindow_LDADD = $(webkitgtk_tests_ldadd)
     468Programs_TestWebKitAPI_WebKitGtk_testwindow_LDFLAGS = $(webkitgtk_tests_ldflags)
     469
     470Programs_TestWebKitAPI_WebKitGtk_testdownload_SOURCES = \
     471        Tools/TestWebKitAPI/Tests/WebKitGtk/testdownload.c
     472Programs_TestWebKitAPI_WebKitGtk_testdownload_CFLAGS = $(webkitgtk_tests_cflags)
     473Programs_TestWebKitAPI_WebKitGtk_testdownload_LDADD = $(webkitgtk_tests_ldadd)
     474Programs_TestWebKitAPI_WebKitGtk_testdownload_LDFLAGS = $(webkitgtk_tests_ldflags)
     475
     476Programs_TestWebKitAPI_WebKitGtk_testatk_SOURCES = \
     477        Tools/TestWebKitAPI/Tests/WebKitGtk/testatk.c
     478Programs_TestWebKitAPI_WebKitGtk_testatk_CFLAGS = $(webkitgtk_tests_cflags)
     479Programs_TestWebKitAPI_WebKitGtk_testatk_LDADD = $(webkitgtk_tests_ldadd)
     480Programs_TestWebKitAPI_WebKitGtk_testatk_LDFLAGS = $(webkitgtk_tests_ldflags)
     481
     482Programs_TestWebKitAPI_WebKitGtk_testatkroles_SOURCES = \
     483        Tools/TestWebKitAPI/Tests/WebKitGtk/testatkroles.c
     484Programs_TestWebKitAPI_WebKitGtk_testatkroles_CFLAGS = $(webkitgtk_tests_cflags)
     485Programs_TestWebKitAPI_WebKitGtk_testatkroles_LDADD = $(webkitgtk_tests_ldadd)
     486Programs_TestWebKitAPI_WebKitGtk_testatkroles_LDFLAGS = $(webkitgtk_tests_ldflags)
     487
     488Programs_TestWebKitAPI_WebKitGtk_testwebinspector_SOURCES = \
     489        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c \
     490        Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
     491Programs_TestWebKitAPI_WebKitGtk_testwebinspector_CFLAGS = $(webkitgtk_tests_cflags)
     492Programs_TestWebKitAPI_WebKitGtk_testwebinspector_LDADD = $(webkitgtk_tests_ldadd)
     493Programs_TestWebKitAPI_WebKitGtk_testwebinspector_LDFLAGS = $(webkitgtk_tests_ldflags)
     494
     495Programs_TestWebKitAPI_WebKitGtk_testwebsettings_SOURCES = \
     496        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c
     497Programs_TestWebKitAPI_WebKitGtk_testwebsettings_CFLAGS = $(webkitgtk_tests_cflags)
     498Programs_TestWebKitAPI_WebKitGtk_testwebsettings_LDADD = $(webkitgtk_tests_ldadd)
     499Programs_TestWebKitAPI_WebKitGtk_testwebsettings_LDFLAGS = $(webkitgtk_tests_ldflags)
     500
     501Programs_TestWebKitAPI_WebKitGtk_testwebresource_SOURCES = \
     502        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebresource.c
     503Programs_TestWebKitAPI_WebKitGtk_testwebresource_CFLAGS = $(webkitgtk_tests_cflags)
     504Programs_TestWebKitAPI_WebKitGtk_testwebresource_LDADD = $(webkitgtk_tests_ldadd)
     505
     506Programs_TestWebKitAPI_WebKitGtk_testwebdatasource_SOURCES = \
     507        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c
     508Programs_TestWebKitAPI_WebKitGtk_testwebdatasource_CFLAGS = $(webkitgtk_tests_cflags)
     509Programs_TestWebKitAPI_WebKitGtk_testwebdatasource_LDADD = $(webkitgtk_tests_ldadd)
     510
     511Programs_TestWebKitAPI_WebKitGtk_testwebview_SOURCES = \
     512        Tools/TestWebKitAPI/Tests/WebKitGtk/testwebview.c Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
     513Programs_TestWebKitAPI_WebKitGtk_testwebview_CFLAGS = $(webkitgtk_tests_cflags)
     514Programs_TestWebKitAPI_WebKitGtk_testwebview_LDADD = $(webkitgtk_tests_ldadd)
     515Programs_TestWebKitAPI_WebKitGtk_testwebview_LDFLAGS = $(webkitgtk_tests_ldflags)
     516
     517Programs_TestWebKitAPI_WebKitGtk_testhittestresult_SOURCES = \
     518        Tools/TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c
     519Programs_TestWebKitAPI_WebKitGtk_testhittestresult_CFLAGS = $(webkitgtk_tests_cflags)
     520Programs_TestWebKitAPI_WebKitGtk_testhittestresult_LDADD = $(webkitgtk_tests_ldadd)
     521
     522Programs_TestWebKitAPI_WebKitGtk_testkeyevents_SOURCES = \
     523        Tools/TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c
     524Programs_TestWebKitAPI_WebKitGtk_testkeyevents_CFLAGS = $(webkitgtk_tests_cflags)
     525Programs_TestWebKitAPI_WebKitGtk_testkeyevents_LDADD = $(webkitgtk_tests_ldadd)
     526Programs_TestWebKitAPI_WebKitGtk_testkeyevents_LDFLAGS = $(webkitgtk_tests_ldflags)
     527
     528Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_SOURCES = \
     529        Tools/TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c \
     530        Source/WebCore/platform/gtk/GtkVersioning.c
     531Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_CFLAGS = \
     532        $(webkitgtk_tests_cflags) \
     533        -I$(srcdir)/Source/WebCore/platform/gtk \
     534        -I$(srcdir)/Source/WebCore
     535Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_LDADD = $(webkitgtk_tests_ldadd)
     536Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_LDFLAGS = $(webkitgtk_tests_ldflags)
     537
     538
     539Programs_TestWebKitAPI_WebKit2_TestWebKit2_CPPFLAGS = \
     540        $(Programs_TestWebKitAPI_WTF_TestWTF_CPPFLAGS) \
    216541        -I$(top_builddir)/DerivedSources/WebKit2/include \
    217542        $(FREETYPE_CFLAGS) \
    … …  
    220545        $(LIBSOUP_CFLAGS)
    221546
    222 Programs_TestWebKitAPI_TestWebKit2_CXXFLAGS = \
     547Programs_TestWebKitAPI_WebKit2_TestWebKit2_CXXFLAGS = \
    223548        -DGTEST_HAS_RTTI=0 \
    224549        $(global_cxxflags)
    225550
    226 Programs_TestWebKitAPI_TestWebKit2_LDADD = \
     551Programs_TestWebKitAPI_WebKit2_TestWebKit2_LDADD = \
    227552        Libraries/libTestWebKitAPIMain.la \
    228553        Libraries/libgtest.la \
    … …  
    234559        $(LIBSOUP_LIBS)
    235560
    236 Programs_TestWebKitAPI_TestWebKit2_LDFLAGS = \
    237         $(Programs_TestWebKitAPI_TestWTF_LDFLAGS)
    238 
    239 Programs_TestWebKitAPI_TestWebKit2_SOURCES = \
     561Programs_TestWebKitAPI_WebKit2_TestWebKit2_LDFLAGS = \
     562        $(Programs_TestWebKitAPI_WTF_TestWTF_LDFLAGS)
     563
     564Programs_TestWebKitAPI_WebKit2_TestWebKit2_SOURCES = \
    240565        Tools/TestWebKitAPI/config.h \
    241566        Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp \
    … …  
    358683
    359684
    360 stamp-testwebkitapi-webcore-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebCore_SOURCES)
     685if ENABLE_WEBKIT2
     686noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
     687endif
     688
     689Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \
     690        Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp
     691
     692Libraries_WebExtensions_libWebExtensionTest_la_LDFLAGS = \
     693        -rpath ${shell pwd}/$(top_builddir)/Libraries/WebExtensions/.libs \
     694        $(no_undefined) \
     695        -avoid-version \
     696        -module
     697
     698Libraries_WebExtensions_libWebExtensionTest_la_CPPFLAGS = \
     699        -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \
     700        -I$(top_builddir)/DerivedSources \
     701        -I$(top_builddir)/DerivedSources/WebKit2/webkit2extension/include \
     702        -DWEBKIT2_COMPILATION \
     703        $(webkit2gtk_tests_cppflags)
     704
     705Libraries_WebExtensions_libWebExtensionTest_la_CXXFLAGS = \
     706        $(global_cxxflags)
     707
     708Libraries_WebExtensions_libWebExtensionTest_la_CFLAGS = \
     709        $(global_cflags)
     710
     711
     712if ENABLE_WEBKIT2
     713noinst_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
     714endif
     715
     716Libraries_WebExtensions_libWebProcessTest_la_SOURCES = \
     717        Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp \
     718        Tools/TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp \
     719        Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp \
     720        Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h
     721
     722Libraries_WebExtensions_libWebProcessTest_la_LDFLAGS = \
     723        -rpath ${shell pwd}/$(top_builddir)/Libraries/WebExtensions/.libs \
     724        $(no_undefined) \
     725        -avoid-version \
     726        -module
     727
     728Libraries_WebExtensions_libWebProcessTest_la_CPPFLAGS = \
     729        -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \
     730        -I$(top_builddir)/DerivedSources \
     731        -I$(top_builddir)/DerivedSources/WebKit2/webkit2extension/include \
     732        -DWEBKIT2_COMPILATION \
     733        $(webkit2gtk_tests_cppflags)
     734
     735Libraries_WebExtensions_libWebProcessTest_la_CXXFLAGS = \
     736        $(global_cxxflags)
     737
     738Libraries_WebExtensions_libWebProcessTest_la_CFLAGS = \
     739        $(global_cflags)
     740
     741
     742Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource: Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml)
     743        $(AM_V_at)mkdir -p ${GENPROGRAMS}/TestWebKitAPI/WebKit2Gtk/resources
     744        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
     745
     746DISTCLEANFILES += \
     747        Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
     748
     749noinst_DATA += \
     750        Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
     751
     752
     753Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_SOURCES = \
     754        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp
     755Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     756Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_LDADD = $(webkit2gtk_tests_ldadd)
     757Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_LDFLAGS = $(webkit2gtk_tests_ldflags)
     758
     759Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_SOURCES = \
     760        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp
     761Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     762Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_LDADD = $(webkit2gtk_tests_ldadd)
     763Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_LDFLAGS = $(webkit2gtk_tests_ldflags)
     764
     765Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_SOURCES = \
     766        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp
     767Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     768Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_LDADD = $(webkit2gtk_tests_ldadd)
     769Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_LDFLAGS = $(webkit2gtk_tests_ldflags)
     770
     771Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_SOURCES = \
     772        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp
     773Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     774Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_LDADD = $(webkit2gtk_tests_ldadd)
     775Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_LDFLAGS = $(webkit2gtk_tests_ldflags)
     776
     777Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_SOURCES = \
     778        Tools/TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp
     779Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     780Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_LDADD = $(webkit2gtk_tests_ldadd)
     781Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_LDFLAGS = $(webkit2gtk_tests_ldflags)
     782
     783Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_SOURCES = \
     784        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp
     785Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     786Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_LDADD = $(webkit2gtk_tests_ldadd)
     787Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_LDFLAGS = $(webkit2gtk_tests_ldflags)
     788
     789Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_SOURCES = \
     790        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp
     791Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     792Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_LDADD = $(webkit2gtk_tests_ldadd)
     793Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_LDFLAGS = $(webkit2gtk_tests_ldflags)
     794
     795if HAVE_ATSPI2
     796Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_SOURCES = \
     797        Tools/TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp
     798Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     799Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_LDADD = $(webkit2gtk_tests_ldadd)
     800Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_LDFLAGS = $(webkit2gtk_tests_ldflags)
     801
     802Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_SOURCES = \
     803        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp
     804Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_CPPFLAGS = $(webkit2gtk_tests_cppflags) $(ATSPI2_CFLAGS)
     805Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_LDADD = $(webkit2gtk_tests_ldadd) $(ATSPI2_LIBS)
     806Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_LDFLAGS = $(webkit2gtk_tests_ldflags)
     807endif
     808
     809Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_SOURCES = \
     810        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp
     811Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     812Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_LDADD = $(webkit2gtk_tests_ldadd)
     813Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_LDFLAGS = $(webkit2gtk_tests_ldflags)
     814
     815Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_SOURCES = \
     816        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp
     817Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     818Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_LDADD = $(webkit2gtk_tests_ldadd)
     819Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_LDFLAGS = $(webkit2gtk_tests_ldflags)
     820
     821Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_SOURCES = \
     822        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp
     823Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_CPPFLAGS = $(webkit2gtk_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS)
     824Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_LDADD = $(webkit2gtk_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS)
     825Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_LDFLAGS = $(webkit2gtk_tests_ldflags)
     826
     827Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_SOURCES = \
     828        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp
     829Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     830Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_LDADD = $(webkit2gtk_tests_ldadd)
     831Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_LDFLAGS = $(webkit2gtk_tests_ldflags)
     832
     833Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_SOURCES = \
     834        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp
     835Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     836Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_LDADD = $(webkit2gtk_tests_ldadd)
     837Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_LDFLAGS = $(webkit2gtk_tests_ldflags)
     838
     839Programs_TestWebKitAPI_WebKit2Gtk_TestResources_SOURCES = \
     840        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp
     841Programs_TestWebKitAPI_WebKit2Gtk_TestResources_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     842Programs_TestWebKitAPI_WebKit2Gtk_TestResources_LDADD = $(webkit2gtk_tests_ldadd)
     843Programs_TestWebKitAPI_WebKit2Gtk_TestResources_LDFLAGS = $(webkit2gtk_tests_ldflags)
     844
     845Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_SOURCES = \
     846        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp
     847Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     848Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_LDADD = $(webkit2gtk_tests_ldadd)
     849Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_LDFLAGS = $(webkit2gtk_tests_ldflags)
     850
     851Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_SOURCES = \
     852        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp
     853Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_CPPFLAGS = \
     854        $(webkit2gtk_tests_cppflags)
     855Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_LDADD = $(webkit2gtk_tests_ldadd)
     856Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_LDFLAGS = $(webkit2gtk_tests_ldflags)
     857
     858Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_SOURCES = \
     859        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp
     860Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     861Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_LDADD = $(webkit2gtk_tests_ldadd)
     862Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_LDFLAGS = $(webkit2gtk_tests_ldflags)
     863
     864Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_SOURCES = \
     865        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp
     866Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     867Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_LDADD = $(webkit2gtk_tests_ldadd)
     868Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_LDFLAGS = $(webkit2gtk_tests_ldflags)
     869
     870Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_SOURCES = \
     871        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp
     872Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     873Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_LDADD = $(webkit2gtk_tests_ldadd)
     874Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_LDFLAGS = $(webkit2gtk_tests_ldflags)
     875
     876Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_SOURCES = \
     877        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp
     878Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     879Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_LDADD = $(webkit2gtk_tests_ldadd)
     880Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_LDFLAGS = $(webkit2gtk_tests_ldflags)
     881
     882Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_SOURCES = \
     883        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp
     884Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     885Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_LDADD = $(webkit2gtk_tests_ldadd)
     886Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_LDFLAGS = $(webkit2gtk_tests_ldflags)
     887
     888Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_SOURCES = \
     889        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp
     890Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     891Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_LDADD = $(webkit2gtk_tests_ldadd)
     892Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_LDFLAGS = $(webkit2gtk_tests_ldflags)
     893
     894Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_SOURCES = \
     895        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp
     896Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     897Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_LDADD = $(webkit2gtk_tests_ldadd)
     898Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_LDFLAGS = $(webkit2gtk_tests_ldflags)
     899
     900Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_SOURCES = \
     901        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp
     902Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     903Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_LDADD = $(webkit2gtk_tests_ldadd)
     904Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_LDFLAGS = $(webkit2gtk_tests_ldflags)
     905
     906Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_SOURCES = \
     907        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp
     908Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     909Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_LDADD = $(webkit2gtk_tests_ldadd)
     910Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_LDFLAGS = $(webkit2gtk_tests_ldflags)
     911
     912Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_SOURCES = \
     913        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp
     914Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_CPPFLAGS = $(webkit2gtk_tests_cppflags)
     915Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_LDADD = $(webkit2gtk_tests_ldadd)
     916Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_LDFLAGS = $(webkit2gtk_tests_ldflags)
     917
     918
     919stamp-testwebkitapi-webcore-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_WebCore_TestWebCore_SOURCES)
    361920        $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI/Tests/WebCore $(GENSOURCES_WEBCORE)/include gtk \
    362921        && echo timestamp > $(@F)
    363922
    364 stamp-testwebkitapi-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebKit2_SOURCES) $(Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES)
     923stamp-testwebkitapi-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_WebKit2_TestWebKit2_SOURCES) $(Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES)
    365924        $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI $(GENSOURCES_WEBKIT2)/include gtk \
    366925        && echo timestamp > $(@F)
    … …  
    387946        Tools/TestWebKitAPI/Tests/WebKit2/simple-iframe.html \
    388947        Tools/TestWebKitAPI/Tests/WebKit2/simple-tall.html \
    389         Tools/TestWebKitAPI/Tests/WebKit2/spacebar-scrolling.html
     948        Tools/TestWebKitAPI/Tests/WebKit2/spacebar-scrolling.html \
     949        Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/test-cert.pem \
     950        Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/test-key.pem \
     951        Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml \
     952        Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js \
     953        Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.h \
     954        Tools/TestWebKitAPI/Tests/WebKitGtk/resources/blank.ico \
     955        Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html \
     956        Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.ogg \
     957        Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf \
     958        Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.txt

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    3939    WebKitWebView* webView = WEBKIT_WEB_VIEW(webkit_web_view_new());
    4040    webkit_web_view_load_html(webView,
    41                               "<html>"
    42                               "  <body>"
    43                               "   <h1>This is a test</h1>"
    44                               "   <p>This is a paragraph with some plain text.</p>"
    45                               "   <p>This paragraph contains <a href=\"http://www.webkitgtk.org\">a link</a> in the middle.</p>"
    46                               "  </body>"
    47                               "</html>",
    48                               0);
     41        "<html>"
     42        "  <body>"
     43        "   <h1>This is a test</h1>"
     44        "   <p>This is a paragraph with some plain text.</p>"
     45        "   <p>This paragraph contains <a href=\"http://www.webkitgtk.org\">a link</a> in the middle.</p>"
     46        "  </body>"
     47        "</html>",
     48        0);
    4949
    5050    GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt

    r161365 r161366  
    1 set(TEST_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
    2 set(TEST_RESOURCES_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources)
     1set(TEST_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit2GtkAPITests)
     2set(TEST_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/WebKit2Gtk)
     3set(TEST_RESOURCES_DIR ${TEST_BINARY_DIR}/resources)
    34file(MAKE_DIRECTORY ${TEST_RESOURCES_DIR})
    45
    … …  
    2021    ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
    2122    ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
     23    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
    2224    ${ATSPI_INCLUDE_DIRS}
    2325    ${GLIB_INCLUDE_DIRS}
    … …  
    2729
    2830add_library(WebKit2APITestCore STATIC
    29     LoadTrackingTest.cpp
    30     WebKitTestBus.cpp
    31     WebKitTestServer.cpp
    32     WebProcessTestRunner.cpp
    33     TestMain.cpp
    34     WebViewTest.cpp
     31    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp
     32    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp
     33    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp
     34    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp
     35    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp
     36    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp
    3537)
    36 
    3738target_link_libraries(WebKit2APITestCore WebKit2)
    3839
    … …  
    4041    DEPENDS resources/webkit2gtk-tests.gresource.xml
    4142            resources/link-title.js
    42     COMMAND glib-compile-resources --target=${TEST_RESOURCES_DIR}/webkit2gtk-tests-resources.gresource --sourcedir=${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml
     43    COMMAND glib-compile-resources
     44            --target=${TEST_RESOURCES_DIR}/webkit2gtk-tests-resources.gresource
     45            --sourcedir=${CMAKE_SOURCE_DIR}
     46            ${CMAKE_CURRENT_LIST_DIR}/resources/webkit2gtk-tests.gresource.xml
    4347)
    4448
    … …  
    7276    )
    7377    set_target_properties(${test_name} PROPERTIES
    74         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests
     78        RUNTIME_OUTPUT_DIRECTORY ${TEST_BINARY_DIR}
    7579    )
    7680endmacro()

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    8080{
    8181    // Prepare argv[] for spawning the server process.
    82     GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", gTestServerAppName, NULL));
     82    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", gTestServerAppName, NULL));
    8383
    8484    // We install a handler to ensure that we kill the child process

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    121121
    122122    GRefPtr<WebKitPrintOperation> m_printOperation;
    123     unsigned int m_expectedError;
     123    unsigned m_expectedError;
    124124};
    125125
    … …  
    147147    test->waitUntilPrintFinished();
    148148
    149     GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
    150                                                               static_cast<GFileQueryInfoFlags>(0), 0, 0));
     149    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(),
     150        G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
     151        static_cast<GFileQueryInfoFlags>(0), 0, 0));
    151152    g_assert(fileInfo.get());
    152153    g_assert_cmpint(g_file_info_get_size(fileInfo.get()), >, 0);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    257257        , m_resourceDataReceived(0)
    258258    {
    259          m_resourcesToLoad = 2;
     259        m_resourcesToLoad = 2;
    260260    }
    261261

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    136136    gulong scriptDialogID = g_signal_connect(test->m_webView, "script-dialog", G_CALLBACK(scriptDialogCallback), &result.outPtr());
    137137
    138     static const char *mainWorldScript =
     138    static const char* mainWorldScript =
    139139        "top.foo = 'Foo';\n"
    140140        "document.getElementById('console').innerHTML = top.foo;\n"
    … …  
    150150    g_assert_cmpstr(valueString.get(), ==, "Foo");
    151151
    152     static const char *isolatedWorldScript =
     152    static const char* isolatedWorldScript =
    153153        "document.getElementById('console').innerHTML = top.foo;\n"
    154154        "window.open = function () { alert('Isolated World'); }\n"

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    8888{
    8989    // Prepare argv[] for spawning the server process.
    90     GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", kTestServerAppName, NULL));
     90    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", kTestServerAppName, NULL));
    9191
    9292    char* testServerArgv[2];
    … …  
    9797    // communication channel, so we know when it's ready.
    9898    int childStdout = 0;
    99     if (!g_spawn_async_with_pipes(0, testServerArgv, 0, static_cast<GSpawnFlags>(0), 0, 0,
    100                                   &kChildProcessPid, 0, &childStdout, 0, 0)) {
     99    if (!g_spawn_async_with_pipes(0, testServerArgv, 0, static_cast<GSpawnFlags>(0), 0, 0, &kChildProcessPid, 0, &childStdout, 0, 0)) {
    101100        close(childStdout);
    102101        return;

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp

    r161365 r161366  
    279279void testWebKitSettingsNewWithSettings(Test* test, gconstpointer)
    280280{
    281     GRefPtr<WebKitSettings> settings = adoptGRef(webkit_settings_new_with_settings("enable-javascript", FALSE,
    282                                                                                    "auto-load-images", FALSE,
    283                                                                                    "load-icons-ignoring-image-load-setting", TRUE,
    284                                                                                    NULL));
     281    GRefPtr<WebKitSettings> settings = adoptGRef(webkit_settings_new_with_settings(
     282        "enable-javascript", FALSE,
     283        "auto-load-images", FALSE,
     284        "load-icons-ignoring-image-load-setting", TRUE,
     285        nullptr));
    285286    test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(settings.get()));
    286287    g_assert(!webkit_settings_get_enable_javascript(settings.get()));

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    401401    webkit_security_manager_register_uri_scheme_as_cors_enabled(test->m_manager, "foo");
    402402    test->verifyThatSchemeMatchesPolicy("foo", SecurityPolicyTest::Local | SecurityPolicyTest::NoAccess | SecurityPolicyTest::DisplayIsolated | SecurityPolicyTest::Secure
    403                 | SecurityPolicyTest::CORSEnabled);
     403        | SecurityPolicyTest::CORSEnabled);
    404404    webkit_security_manager_register_uri_scheme_as_empty_document(test->m_manager, "foo");
    405405    test->verifyThatSchemeMatchesPolicy("foo", SecurityPolicyTest::Local | SecurityPolicyTest::NoAccess | SecurityPolicyTest::DisplayIsolated | SecurityPolicyTest::Secure
    406                 | SecurityPolicyTest::CORSEnabled | SecurityPolicyTest::EmptyDocument);
     406        | SecurityPolicyTest::CORSEnabled | SecurityPolicyTest::EmptyDocument);
    407407}
    408408

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp

    r161365 r161366  
    387387{
    388388    test->loadHtml("<html>"
    389                    "<body>"
    390                    "  <p>A paragraph with plain text</p>"
    391                    "  <p>"
    392                    "    A red box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMVwnSZnwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12P8z8DAwMDAxMDAwMDAAAANHQEDK+mmyAAAAABJRU5ErkJggg=='></br>"
    393                    "    A blue box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMvBHhALQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12Nk4PnPwMDAxMDAwMDAAAALrwEPPIs1pgAAAABJRU5ErkJggg=='>"
    394                    "  </p>"
    395                    "</body>"
    396                    "</html>", 0);
     389        "<body>"
     390        "  <p>A paragraph with plain text</p>"
     391        "  <p>"
     392        "    A red box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMVwnSZnwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12P8z8DAwMDAxMDAwMDAAAANHQEDK+mmyAAAAABJRU5ErkJggg=='></br>"
     393        "    A blue box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMvBHhALQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12Nk4PnPwMDAxMDAwMDAAAALrwEPPIs1pgAAAABJRU5ErkJggg=='>"
     394        "  </p>"
     395        "</body>"
     396        "</html>", 0);
    397397    test->waitUntilLoadFinished();
    398398

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    8282    GRefPtr<WebKitWebViewGroup> viewGroup1 = adoptGRef(webkit_web_view_group_new("TestGroup1"));
    8383    test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(viewGroup1.get()));
    84     GRefPtr<WebKitSettings> newSettings = adoptGRef(webkit_settings_new_with_settings("enable-javascript", FALSE, NULL));
     84    GRefPtr<WebKitSettings> newSettings = adoptGRef(webkit_settings_new_with_settings("enable-javascript", FALSE, nullptr));
    8585    test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(newSettings.get()));
    8686    webkit_web_view_group_set_settings(viewGroup1.get(), newSettings.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    2626    MAKE_GLIB_TEST_FIXTURE(EditorTest);
    2727
    28     static const unsigned int kClipboardWaitTimeout = 50;
    29     static const unsigned int kClipboardWaitMaxTries = 2;
     28    static const unsigned kClipboardWaitTimeout = 50;
     29    static const unsigned kClipboardWaitMaxTries = 2;
    3030
    3131    EditorTest()

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    211211        JSEvaluateScript(jsContext, jsScript.get(), 0, 0, 0, 0);
    212212        g_dbus_method_invocation_return_value(invocation, 0);
    213     } else if (!g_strcmp0(methodName, "AbortProcess")) {
     213    } else if (!g_strcmp0(methodName, "AbortProcess"))
    214214        abort();
    215     }
    216215}
    217216
    … …  
    222221static void busAcquiredCallback(GDBusConnection* connection, const char* name, gpointer userData)
    223222{
    224     static GDBusNodeInfo *introspectionData = 0;
     223    static GDBusNodeInfo* introspectionData = 0;
    225224    if (!introspectionData)
    226225        introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    7777static void busAcquiredCallback(GDBusConnection* connection, const char* name, gpointer userData)
    7878{
    79     static GDBusNodeInfo *introspectionData = 0;
     79    static GDBusNodeInfo* introspectionData = 0;
    8080    if (!introspectionData)
    8181        introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml

    • Property svn:eol-style set to LF
    r161365 r161366  
    22<gresources>
    33  <gresource prefix="/org/webkit/webkit2gtk/tests/">
    4     <file alias="link-title.js">Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js</file>
     4    <file alias="link-title.js">Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js</file>
    55  </gresource>
    66</gresources>

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt

    r161365 r161366  
    2525    )
    2626    set_target_properties(${test_name} PROPERTIES
    27         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit1GObjectAPITests
     27        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/WebKitGtk
    2828    )
    2929endmacro()

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf

    • Property svn:mime-type set to application/pdf

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.txt

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.h

    • Property svn:eol-style changed from native to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testatk.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testatkroles.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testdomnode.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testdownload.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c

    • Property svn:eol-style set to LF
    r161365 r161366  
    247247
    248248    /* This hopefully makes the test independent of the path it's called from. */
    249     testutils_relative_chdir("Source/WebKit/gtk/tests/resources/test.html", argv[0]);
     249    testutils_relative_chdir("Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html", argv[0]);
    250250
    251251    SoupServer *server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testglobals.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testloading.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c

    • Property svn:eol-style set to LF
    r161365 r161366  
    179179
    180180    /* Hopefully make test independent of the path it's called from. */
    181     testutils_relative_chdir("Source/WebKit/gtk/tests/resources/test.html", argv[0]);
     181    testutils_relative_chdir("Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html", argv[0]);
    182182
    183183    server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebframe.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebresource.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwebview.c

    • Property svn:eol-style set to LF
    r161365 r161366  
    717717
    718718    /* Hopefully make test independent of the path it's called from. */
    719     testutils_relative_chdir("Source/WebKit/gtk/tests/resources/test.html", argv[0]);
     719    testutils_relative_chdir("Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html", argv[0]);
    720720
    721721    server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/testwindow.c

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    3131static void registerGResource(void)
    3232{
    33     GOwnPtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "resources", "webkit2gtk-tests-resources.gresource", NULL));
     33    GOwnPtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", "resources", "webkit2gtk-tests-resources.gresource", NULL));
    3434    GResource* resource = g_resource_load(resourcesPath.get(), 0);
    3535    g_assert(resource);

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h

    r161365 r161366  
    4343
    4444#define ASSERT_CMP_CSTRING(s1, cmp, s2) \
    45     do { CString __s1 = (s1); CString __s2 = (s2); \
    46         if (g_strcmp0(__s1.data(), __s2.data()) cmp 0) ; else \
    47             g_assertion_message_cmpstr(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
    48                 #s1 " " #cmp " " #s2, __s1.data(), #cmp, __s2.data()); } while (0)
     45    do {                                                                 \
     46        CString __s1 = (s1);                                             \
     47        CString __s2 = (s2);                                             \
     48        if (g_strcmp0(__s1.data(), __s2.data()) cmp 0) ;                 \
     49        else                                                             \
     50            g_assertion_message_cmpstr(G_LOG_DOMAIN, __FILE__, __LINE__, \
     51                G_STRFUNC, #s1 " " #cmp " " #s2, __s1.data(), #cmp, __s2.data()); \
     52    } while (0)
     53
    4954
    5055class Test {
    … …  
    7984    static CString getWebKit1TestResoucesDir()
    8085    {
    81         GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Source", "WebKit", "gtk", "tests", "resources", NULL));
     86        GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKitGtk", "resources", NULL));
    8287        return resourcesDir.get();
    8388    }
    … …  
    8590    static CString getResourcesDir()
    8691    {
    87         GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Source", "WebKit2", "UIProcess", "API", "gtk", "tests", "resources", NULL));
     92        GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKit2Gtk", "resources", NULL));
    8893        return resourcesDir.get();
    8994    }

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp

    • Property svn:eol-style set to LF
    r161365 r161366  
    3838
    3939    m_soupServer = adoptGRef(soup_server_new(SOUP_SERVER_INTERFACE, address.get(),
    40                                              SOUP_SERVER_SSL_CERT_FILE, sslCertificateFile.get(),
    41                                              SOUP_SERVER_SSL_KEY_FILE, sslKeyFile.get(), NULL));
     40        SOUP_SERVER_SSL_CERT_FILE, sslCertificateFile.get(),
     41        SOUP_SERVER_SSL_KEY_FILE, sslKeyFile.get(), nullptr));
    4242    m_baseURI = type == ServerHTTPS ? soup_uri_new("https://127.0.0.1/") : soup_uri_new("http://127.0.0.1/");
    4343    soup_uri_set_port(m_baseURI, soup_server_get_port(m_soupServer.get()));

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h

    • Property svn:eol-style set to LF
    r161365 r161366  
    3434    };
    3535
    36     WebKitTestServer(ServerType type = ServerHTTP);
     36    WebKitTestServer(ServerType = ServerHTTP);
    3737    virtual ~WebKitTestServer();
    3838

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.h

    • Property svn:eol-style set to LF

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp

    r161365 r161366  
    243243}
    244244
    245 void WebViewTest::mouseMoveTo(int x, int y, unsigned int mouseModifiers)
     245void WebViewTest::mouseMoveTo(int x, int y, unsigned mouseModifiers)
    246246{
    247247    g_assert(m_parentWindow);
    … …  
    267267}
    268268
    269 void WebViewTest::clickMouseButton(int x, int y, unsigned int button, unsigned int mouseModifiers)
     269void WebViewTest::clickMouseButton(int x, int y, unsigned button, unsigned mouseModifiers)
    270270{
    271271    doMouseButtonEvent(GDK_BUTTON_PRESS, x, y, button, mouseModifiers);
    … …  
    273273}
    274274
    275 void WebViewTest::keyStroke(unsigned int keyVal, unsigned int keyModifiers)
     275void WebViewTest::keyStroke(unsigned keyVal, unsigned keyModifiers)
    276276{
    277277    g_assert(m_parentWindow);
    … …  
    299299}
    300300
    301 void WebViewTest::doMouseButtonEvent(GdkEventType eventType, int x, int y, unsigned int button, unsigned int mouseModifiers)
     301void WebViewTest::doMouseButtonEvent(GdkEventType eventType, int x, int y, unsigned button, unsigned mouseModifiers)
    302302{
    303303    g_assert(m_parentWindow);

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h

    r161365 r161366  
    5353    const char* mainResourceData(size_t& mainResourceDataSize);
    5454
    55     void mouseMoveTo(int x, int y, unsigned int mouseModifiers = 0);
    56     void clickMouseButton(int x, int y, unsigned int button = 1, unsigned int mouseModifiers = 0);
    57     void keyStroke(unsigned int keyVal, unsigned int keyModifiers = 0);
     55    void mouseMoveTo(int x, int y, unsigned mouseModifiers = 0);
     56    void clickMouseButton(int x, int y, unsigned button = 1, unsigned mouseModifiers = 0);
     57    void keyStroke(unsigned keyVal, unsigned keyModifiers = 0);
    5858
    5959    WebKitJavascriptResult* runJavaScriptAndWaitUntilFinished(const char* javascript, GError**);
    … …  
    8181
    8282private:
    83     void doMouseButtonEvent(GdkEventType, int, int, unsigned int, unsigned int);
     83    void doMouseButtonEvent(GdkEventType, int, int, unsigned, unsigned);
    8484};
    8585
Note: See TracChangeset for help on using the changeset viewer.