Changeset 161182 in webkit


Ignore:
Timestamp:
Dec 31, 2013 8:14:39 AM (10 years ago)
Author:
Martin Robinson
Message:

[GTK] Make the output directory of GObject unit tests binaries consistent with the CMake build
https://bugs.webkit.org/show_bug.cgi?id=126297

Reviewed by Philippe Normand.

Source/WebKit/gtk:

  • tests/GNUmakefile.am: Build the tests in the new directory.

Source/WebKit2:

  • UIProcess/API/gtk/tests/GNUmakefile.am: Build the tests in the new directory.
  • UIProcess/API/gtk/tests/TestInspectorServer.cpp:

(startTestServer): Update the search path to reflect the new directory.

  • UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp:

(startTestServer): Update the search path to reflect the new directory.

Tools:

  • Scripts/run-gtk-tests: Looks for the tests in the new directories.

(TestRunner): Ditto.
(TestRunner._run_test): Ditto.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/gtk/ChangeLog

    r161095 r161182  
     12013-12-30  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Make the output directory of GObject unit tests binaries consistent with the CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=126297
     5
     6        Reviewed by Philippe Normand.
     7
     8        * tests/GNUmakefile.am: Build the tests in the new directory.
     9
    1102013-12-26  Martin Robinson  <mrobinson@igalia.com>
    211
  • trunk/Source/WebKit/gtk/tests/GNUmakefile.am

    r155918 r161182  
    3333if ENABLE_WEBKIT1
    3434noinst_PROGRAMS += \
    35         Programs/unittests/testapplicationcache \
    36         Programs/unittests/testcontextmenu \
    37         Programs/unittests/testdomdocument \
    38         Programs/unittests/testdomdomwindow \
    39         Programs/unittests/testdomnode \
    40         Programs/unittests/testhttpbackend \
    41         Programs/unittests/testfavicondatabase \
    42         Programs/unittests/testloading \
    43         Programs/unittests/testglobals \
    44         Programs/unittests/testmimehandling \
    45         Programs/unittests/testnetworkrequest \
    46         Programs/unittests/testnetworkresponse \
    47         Programs/unittests/testwebframe \
    48         Programs/unittests/testwebbackforwardlist \
    49         Programs/unittests/testwebhistoryitem \
    50         Programs/unittests/testwindow \
    51         Programs/unittests/testdownload \
    52         Programs/unittests/testatk \
    53         Programs/unittests/testatkroles \
    54         Programs/unittests/testhittestresult \
    55         Programs/unittests/testwebinspector \
    56         Programs/unittests/testwebsettings \
    57         Programs/unittests/testwebresource \
    58         Programs/unittests/testwebdatasource \
    59         Programs/unittests/testwebplugindatabase \
    60         Programs/unittests/testwebview \
    61         Programs/unittests/testkeyevents \
    62         Programs/unittests/testcopyandpaste
     35        Programs/WebKit1GObjectAPITests/testapplicationcache \
     36        Programs/WebKit1GObjectAPITests/testcontextmenu \
     37        Programs/WebKit1GObjectAPITests/testdomdocument \
     38        Programs/WebKit1GObjectAPITests/testdomdomwindow \
     39        Programs/WebKit1GObjectAPITests/testdomnode \
     40        Programs/WebKit1GObjectAPITests/testhttpbackend \
     41        Programs/WebKit1GObjectAPITests/testfavicondatabase \
     42        Programs/WebKit1GObjectAPITests/testloading \
     43        Programs/WebKit1GObjectAPITests/testglobals \
     44        Programs/WebKit1GObjectAPITests/testmimehandling \
     45        Programs/WebKit1GObjectAPITests/testnetworkrequest \
     46        Programs/WebKit1GObjectAPITests/testnetworkresponse \
     47        Programs/WebKit1GObjectAPITests/testwebframe \
     48        Programs/WebKit1GObjectAPITests/testwebbackforwardlist \
     49        Programs/WebKit1GObjectAPITests/testwebhistoryitem \
     50        Programs/WebKit1GObjectAPITests/testwindow \
     51        Programs/WebKit1GObjectAPITests/testdownload \
     52        Programs/WebKit1GObjectAPITests/testatk \
     53        Programs/WebKit1GObjectAPITests/testatkroles \
     54        Programs/WebKit1GObjectAPITests/testhittestresult \
     55        Programs/WebKit1GObjectAPITests/testwebinspector \
     56        Programs/WebKit1GObjectAPITests/testwebsettings \
     57        Programs/WebKit1GObjectAPITests/testwebresource \
     58        Programs/WebKit1GObjectAPITests/testwebdatasource \
     59        Programs/WebKit1GObjectAPITests/testwebplugindatabase \
     60        Programs/WebKit1GObjectAPITests/testwebview \
     61        Programs/WebKit1GObjectAPITests/testkeyevents \
     62        Programs/WebKit1GObjectAPITests/testcopyandpaste
    6363endif
    6464
    6565# Add additional tests here
    66 Programs_unittests_testapplicationcache_SOURCES = Source/WebKit/gtk/tests/testapplicationcache.c
    67 Programs_unittests_testapplicationcache_CFLAGS = $(webkit_tests_cflags)
    68 Programs_unittests_testapplicationcache_LDADD = $(webkit_tests_ldadd)
    69 Programs_unittests_testapplicationcache_LDFLAGS = $(webkit_tests_ldflags)
    70 
    71 Programs_unittests_testcontextmenu_SOURCES = Source/WebKit/gtk/tests/testcontextmenu.c
    72 Programs_unittests_testcontextmenu_CFLAGS = $(webkit_tests_cflags)
    73 Programs_unittests_testcontextmenu_LDADD = $(webkit_tests_ldadd)
    74 Programs_unittests_testcontextmenu_LDFLAGS = $(webkit_tests_ldflags)
    75 
    76 Programs_unittests_testdomdocument_SOURCES = Source/WebKit/gtk/tests/testdomdocument.c
    77 Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
    78 Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
    79 Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
    80 
    81 Programs_unittests_testdomdomwindow_SOURCES = Source/WebKit/gtk/tests/testdomdomwindow.c
    82 Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
    83 Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
    84 Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
    85 
    86 Programs_unittests_testdomnode_SOURCES = Source/WebKit/gtk/tests/testdomnode.c
    87 Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
    88 Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
    89 Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
    90 
    91 Programs_unittests_testhttpbackend_SOURCES = Source/WebKit/gtk/tests/testhttpbackend.c
    92 Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
    93 Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
    94 Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
    95 
    96 Programs_unittests_testfavicondatabase_SOURCES = Source/WebKit/gtk/tests/testfavicondatabase.c Source/WebKit/gtk/tests/test_utils.c
    97 Programs_unittests_testfavicondatabase_CFLAGS = $(webkit_tests_cflags)
    98 Programs_unittests_testfavicondatabase_LDADD = $(webkit_tests_ldadd)
    99 Programs_unittests_testfavicondatabase_LDFLAGS = $(webkit_tests_ldflags)
    100 
    101 Programs_unittests_testglobals_SOURCES = Source/WebKit/gtk/tests/testglobals.c
    102 Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
    103 Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
    104 Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
    105 
    106 Programs_unittests_testloading_SOURCES = Source/WebKit/gtk/tests/testloading.c
    107 Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
    108 Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
    109 Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
    110 
    111 Programs_unittests_testmimehandling_SOURCES = Source/WebKit/gtk/tests/testmimehandling.c Source/WebKit/gtk/tests/test_utils.c
    112 Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
    113 Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
    114 Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
    115 
    116 Programs_unittests_testnetworkrequest_SOURCES = Source/WebKit/gtk/tests/testnetworkrequest.c
    117 Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
    118 Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
    119 Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
    120 
    121 Programs_unittests_testnetworkresponse_SOURCES = Source/WebKit/gtk/tests/testnetworkresponse.c
    122 Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
    123 Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
    124 Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
    125 
    126 Programs_unittests_testwebframe_SOURCES = Source/WebKit/gtk/tests/testwebframe.c
    127 Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
    128 Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
    129 Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
    130 
    131 Programs_unittests_testwebplugindatabase_SOURCES = Source/WebKit/gtk/tests/testwebplugindatabase.c
    132 Programs_unittests_testwebplugindatabase_CFLAGS = -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" $(webkit_tests_cflags)
    133 Programs_unittests_testwebplugindatabase_LDADD = $(webkit_tests_ldadd)
    134 Programs_unittests_testwebplugindatabase_LDFLAGS = $(webkit_tests_ldflags)
    135 
    136 Programs_unittests_testwebbackforwardlist_SOURCES = Source/WebKit/gtk/tests/testwebbackforwardlist.c
    137 Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
    138 Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
    139 Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
    140 
    141 Programs_unittests_testwebhistoryitem_SOURCES = Source/WebKit/gtk/tests/testwebhistoryitem.c
    142 Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
    143 Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
    144 Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
    145 
    146 Programs_unittests_testwindow_SOURCES = Source/WebKit/gtk/tests/testwindow.c
    147 Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
    148 Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
    149 Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
    150 
    151 Programs_unittests_testdownload_SOURCES = Source/WebKit/gtk/tests/testdownload.c
    152 Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
    153 Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
    154 Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
    155 
    156 Programs_unittests_testatk_SOURCES = Source/WebKit/gtk/tests/testatk.c
    157 Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
    158 Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
    159 Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
    160 
    161 Programs_unittests_testatkroles_SOURCES = Source/WebKit/gtk/tests/testatkroles.c
    162 Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
    163 Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
    164 Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
    165 
    166 Programs_unittests_testwebinspector_SOURCES = Source/WebKit/gtk/tests/testwebinspector.c Source/WebKit/gtk/tests/test_utils.c
    167 Programs_unittests_testwebinspector_CFLAGS = $(webkit_tests_cflags)
    168 Programs_unittests_testwebinspector_LDADD = $(webkit_tests_ldadd)
    169 Programs_unittests_testwebinspector_LDFLAGS = $(webkit_tests_ldflags)
    170 
    171 Programs_unittests_testwebsettings_SOURCES = Source/WebKit/gtk/tests/testwebsettings.c
    172 Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
    173 Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
    174 Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
    175 
    176 Programs_unittests_testwebresource_SOURCES = Source/WebKit/gtk/tests/testwebresource.c
    177 Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags)
    178 Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd)
    179 
    180 Programs_unittests_testwebdatasource_SOURCES = Source/WebKit/gtk/tests/testwebdatasource.c
    181 Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
    182 Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
    183 
    184 Programs_unittests_testwebview_SOURCES = Source/WebKit/gtk/tests/testwebview.c Source/WebKit/gtk/tests/test_utils.c
    185 Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
    186 Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
    187 Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
    188 
    189 Programs_unittests_testhittestresult_SOURCES = Source/WebKit/gtk/tests/testhittestresult.c
    190 Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
    191 Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
    192 
    193 Programs_unittests_testkeyevents_SOURCES = Source/WebKit/gtk/tests/testkeyevents.c
    194 Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
    195 Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
    196 Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
    197 
    198 Programs_unittests_testcopyandpaste_SOURCES = Source/WebKit/gtk/tests/testcopyandpaste.c \
     66Programs_WebKit1GObjectAPITests_testapplicationcache_SOURCES = Source/WebKit/gtk/tests/testapplicationcache.c
     67Programs_WebKit1GObjectAPITests_testapplicationcache_CFLAGS = $(webkit_tests_cflags)
     68Programs_WebKit1GObjectAPITests_testapplicationcache_LDADD = $(webkit_tests_ldadd)
     69Programs_WebKit1GObjectAPITests_testapplicationcache_LDFLAGS = $(webkit_tests_ldflags)
     70
     71Programs_WebKit1GObjectAPITests_testcontextmenu_SOURCES = Source/WebKit/gtk/tests/testcontextmenu.c
     72Programs_WebKit1GObjectAPITests_testcontextmenu_CFLAGS = $(webkit_tests_cflags)
     73Programs_WebKit1GObjectAPITests_testcontextmenu_LDADD = $(webkit_tests_ldadd)
     74Programs_WebKit1GObjectAPITests_testcontextmenu_LDFLAGS = $(webkit_tests_ldflags)
     75
     76Programs_WebKit1GObjectAPITests_testdomdocument_SOURCES = Source/WebKit/gtk/tests/testdomdocument.c
     77Programs_WebKit1GObjectAPITests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
     78Programs_WebKit1GObjectAPITests_testdomdocument_LDADD = $(webkit_tests_ldadd)
     79Programs_WebKit1GObjectAPITests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
     80
     81Programs_WebKit1GObjectAPITests_testdomdomwindow_SOURCES = Source/WebKit/gtk/tests/testdomdomwindow.c
     82Programs_WebKit1GObjectAPITests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
     83Programs_WebKit1GObjectAPITests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
     84Programs_WebKit1GObjectAPITests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
     85
     86Programs_WebKit1GObjectAPITests_testdomnode_SOURCES = Source/WebKit/gtk/tests/testdomnode.c
     87Programs_WebKit1GObjectAPITests_testdomnode_CFLAGS = $(webkit_tests_cflags)
     88Programs_WebKit1GObjectAPITests_testdomnode_LDADD = $(webkit_tests_ldadd)
     89Programs_WebKit1GObjectAPITests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
     90
     91Programs_WebKit1GObjectAPITests_testhttpbackend_SOURCES = Source/WebKit/gtk/tests/testhttpbackend.c
     92Programs_WebKit1GObjectAPITests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
     93Programs_WebKit1GObjectAPITests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
     94Programs_WebKit1GObjectAPITests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
     95
     96Programs_WebKit1GObjectAPITests_testfavicondatabase_SOURCES = Source/WebKit/gtk/tests/testfavicondatabase.c Source/WebKit/gtk/tests/test_utils.c
     97Programs_WebKit1GObjectAPITests_testfavicondatabase_CFLAGS = $(webkit_tests_cflags)
     98Programs_WebKit1GObjectAPITests_testfavicondatabase_LDADD = $(webkit_tests_ldadd)
     99Programs_WebKit1GObjectAPITests_testfavicondatabase_LDFLAGS = $(webkit_tests_ldflags)
     100
     101Programs_WebKit1GObjectAPITests_testglobals_SOURCES = Source/WebKit/gtk/tests/testglobals.c
     102Programs_WebKit1GObjectAPITests_testglobals_CFLAGS = $(webkit_tests_cflags)
     103Programs_WebKit1GObjectAPITests_testglobals_LDADD = $(webkit_tests_ldadd)
     104Programs_WebKit1GObjectAPITests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
     105
     106Programs_WebKit1GObjectAPITests_testloading_SOURCES = Source/WebKit/gtk/tests/testloading.c
     107Programs_WebKit1GObjectAPITests_testloading_CFLAGS = $(webkit_tests_cflags)
     108Programs_WebKit1GObjectAPITests_testloading_LDADD = $(webkit_tests_ldadd)
     109Programs_WebKit1GObjectAPITests_testloading_LDFLAGS = $(webkit_tests_ldflags)
     110
     111Programs_WebKit1GObjectAPITests_testmimehandling_SOURCES = Source/WebKit/gtk/tests/testmimehandling.c Source/WebKit/gtk/tests/test_utils.c
     112Programs_WebKit1GObjectAPITests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
     113Programs_WebKit1GObjectAPITests_testmimehandling_LDADD = $(webkit_tests_ldadd)
     114Programs_WebKit1GObjectAPITests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
     115
     116Programs_WebKit1GObjectAPITests_testnetworkrequest_SOURCES = Source/WebKit/gtk/tests/testnetworkrequest.c
     117Programs_WebKit1GObjectAPITests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
     118Programs_WebKit1GObjectAPITests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
     119Programs_WebKit1GObjectAPITests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
     120
     121Programs_WebKit1GObjectAPITests_testnetworkresponse_SOURCES = Source/WebKit/gtk/tests/testnetworkresponse.c
     122Programs_WebKit1GObjectAPITests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
     123Programs_WebKit1GObjectAPITests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
     124Programs_WebKit1GObjectAPITests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
     125
     126Programs_WebKit1GObjectAPITests_testwebframe_SOURCES = Source/WebKit/gtk/tests/testwebframe.c
     127Programs_WebKit1GObjectAPITests_testwebframe_CFLAGS = $(webkit_tests_cflags)
     128Programs_WebKit1GObjectAPITests_testwebframe_LDADD = $(webkit_tests_ldadd)
     129Programs_WebKit1GObjectAPITests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
     130
     131Programs_WebKit1GObjectAPITests_testwebplugindatabase_SOURCES = Source/WebKit/gtk/tests/testwebplugindatabase.c
     132Programs_WebKit1GObjectAPITests_testwebplugindatabase_CFLAGS = -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" $(webkit_tests_cflags)
     133Programs_WebKit1GObjectAPITests_testwebplugindatabase_LDADD = $(webkit_tests_ldadd)
     134Programs_WebKit1GObjectAPITests_testwebplugindatabase_LDFLAGS = $(webkit_tests_ldflags)
     135
     136Programs_WebKit1GObjectAPITests_testwebbackforwardlist_SOURCES = Source/WebKit/gtk/tests/testwebbackforwardlist.c
     137Programs_WebKit1GObjectAPITests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
     138Programs_WebKit1GObjectAPITests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
     139Programs_WebKit1GObjectAPITests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
     140
     141Programs_WebKit1GObjectAPITests_testwebhistoryitem_SOURCES = Source/WebKit/gtk/tests/testwebhistoryitem.c
     142Programs_WebKit1GObjectAPITests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
     143Programs_WebKit1GObjectAPITests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
     144Programs_WebKit1GObjectAPITests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
     145
     146Programs_WebKit1GObjectAPITests_testwindow_SOURCES = Source/WebKit/gtk/tests/testwindow.c
     147Programs_WebKit1GObjectAPITests_testwindow_CFLAGS = $(webkit_tests_cflags)
     148Programs_WebKit1GObjectAPITests_testwindow_LDADD = $(webkit_tests_ldadd)
     149Programs_WebKit1GObjectAPITests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
     150
     151Programs_WebKit1GObjectAPITests_testdownload_SOURCES = Source/WebKit/gtk/tests/testdownload.c
     152Programs_WebKit1GObjectAPITests_testdownload_CFLAGS = $(webkit_tests_cflags)
     153Programs_WebKit1GObjectAPITests_testdownload_LDADD = $(webkit_tests_ldadd)
     154Programs_WebKit1GObjectAPITests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
     155
     156Programs_WebKit1GObjectAPITests_testatk_SOURCES = Source/WebKit/gtk/tests/testatk.c
     157Programs_WebKit1GObjectAPITests_testatk_CFLAGS = $(webkit_tests_cflags)
     158Programs_WebKit1GObjectAPITests_testatk_LDADD = $(webkit_tests_ldadd)
     159Programs_WebKit1GObjectAPITests_testatk_LDFLAGS = $(webkit_tests_ldflags)
     160
     161Programs_WebKit1GObjectAPITests_testatkroles_SOURCES = Source/WebKit/gtk/tests/testatkroles.c
     162Programs_WebKit1GObjectAPITests_testatkroles_CFLAGS = $(webkit_tests_cflags)
     163Programs_WebKit1GObjectAPITests_testatkroles_LDADD = $(webkit_tests_ldadd)
     164Programs_WebKit1GObjectAPITests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
     165
     166Programs_WebKit1GObjectAPITests_testwebinspector_SOURCES = Source/WebKit/gtk/tests/testwebinspector.c Source/WebKit/gtk/tests/test_utils.c
     167Programs_WebKit1GObjectAPITests_testwebinspector_CFLAGS = $(webkit_tests_cflags)
     168Programs_WebKit1GObjectAPITests_testwebinspector_LDADD = $(webkit_tests_ldadd)
     169Programs_WebKit1GObjectAPITests_testwebinspector_LDFLAGS = $(webkit_tests_ldflags)
     170
     171Programs_WebKit1GObjectAPITests_testwebsettings_SOURCES = Source/WebKit/gtk/tests/testwebsettings.c
     172Programs_WebKit1GObjectAPITests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
     173Programs_WebKit1GObjectAPITests_testwebsettings_LDADD = $(webkit_tests_ldadd)
     174Programs_WebKit1GObjectAPITests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
     175
     176Programs_WebKit1GObjectAPITests_testwebresource_SOURCES = Source/WebKit/gtk/tests/testwebresource.c
     177Programs_WebKit1GObjectAPITests_testwebresource_CFLAGS = $(webkit_tests_cflags)
     178Programs_WebKit1GObjectAPITests_testwebresource_LDADD = $(webkit_tests_ldadd)
     179
     180Programs_WebKit1GObjectAPITests_testwebdatasource_SOURCES = Source/WebKit/gtk/tests/testwebdatasource.c
     181Programs_WebKit1GObjectAPITests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
     182Programs_WebKit1GObjectAPITests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
     183
     184Programs_WebKit1GObjectAPITests_testwebview_SOURCES = Source/WebKit/gtk/tests/testwebview.c Source/WebKit/gtk/tests/test_utils.c
     185Programs_WebKit1GObjectAPITests_testwebview_CFLAGS = $(webkit_tests_cflags)
     186Programs_WebKit1GObjectAPITests_testwebview_LDADD = $(webkit_tests_ldadd)
     187Programs_WebKit1GObjectAPITests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
     188
     189Programs_WebKit1GObjectAPITests_testhittestresult_SOURCES = Source/WebKit/gtk/tests/testhittestresult.c
     190Programs_WebKit1GObjectAPITests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
     191Programs_WebKit1GObjectAPITests_testhittestresult_LDADD = $(webkit_tests_ldadd)
     192
     193Programs_WebKit1GObjectAPITests_testkeyevents_SOURCES = Source/WebKit/gtk/tests/testkeyevents.c
     194Programs_WebKit1GObjectAPITests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
     195Programs_WebKit1GObjectAPITests_testkeyevents_LDADD = $(webkit_tests_ldadd)
     196Programs_WebKit1GObjectAPITests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
     197
     198Programs_WebKit1GObjectAPITests_testcopyandpaste_SOURCES = Source/WebKit/gtk/tests/testcopyandpaste.c \
    199199        Source/WebCore/platform/gtk/GtkVersioning.c
    200 Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \
     200Programs_WebKit1GObjectAPITests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \
    201201        -I$(srcdir)/Source/WebCore/platform/gtk \
    202202        -I$(srcdir)/Source/WebCore
    203 Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
    204 Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
     203Programs_WebKit1GObjectAPITests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
     204Programs_WebKit1GObjectAPITests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
    205205
    206206EXTRA_DIST +=  \
  • trunk/Source/WebKit2/ChangeLog

    r161176 r161182  
     12013-12-30  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Make the output directory of GObject unit tests binaries consistent with the CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=126297
     5
     6        Reviewed by Philippe Normand.
     7
     8        * UIProcess/API/gtk/tests/GNUmakefile.am: Build the tests in the new directory.
     9        * UIProcess/API/gtk/tests/TestInspectorServer.cpp:
     10        (startTestServer): Update the search path to reflect the new directory.
     11        * UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp:
     12        (startTestServer): Update the search path to reflect the new directory.
     13
    1142013-12-30  Carlos Garcia Campos  <cgarcia@igalia.com>
    215
  • trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am

    r161138 r161182  
    22
    33TEST_PROGS += \
    4         Programs/WebKit2APITests/InspectorTestServer \
    5         Programs/WebKit2APITests/TestAuthentication \
    6         Programs/WebKit2APITests/TestBackForwardList \
    7         Programs/WebKit2APITests/TestContextMenu \
    8         Programs/WebKit2APITests/TestCookieManager \
    9         Programs/WebKit2APITests/TestDOMNode \
    10         Programs/WebKit2APITests/TestDownloads \
    11         Programs/WebKit2APITests/TestFrame \
    12         Programs/WebKit2APITests/TestInspector \
    13         Programs/WebKit2APITests/TestInspectorServer \
    14         Programs/WebKit2APITests/TestLoaderClient \
    15         Programs/WebKit2APITests/TestPrinting \
    16         Programs/WebKit2APITests/TestResources \
    17         Programs/WebKit2APITests/TestSSL \
    18         Programs/WebKit2APITests/TestUIClient \
    19         Programs/WebKit2APITests/TestWebExtensions \
    20         Programs/WebKit2APITests/TestWebKitVersion \
    21         Programs/WebKit2APITests/TestWebKitFaviconDatabase \
    22         Programs/WebKit2APITests/TestWebKitFindController \
    23         Programs/WebKit2APITests/TestWebKitPolicyClient \
    24         Programs/WebKit2APITests/TestWebKitSettings \
    25         Programs/WebKit2APITests/TestWebKitWebContext \
    26         Programs/WebKit2APITests/TestWebKitWebView \
    27         Programs/WebKit2APITests/TestWebKitWebViewGroup \
    28         Programs/WebKit2APITests/TestWebViewEditor
     4        Programs/WebKit2GObjectAPITests/InspectorTestServer \
     5        Programs/WebKit2GObjectAPITests/TestAuthentication \
     6        Programs/WebKit2GObjectAPITests/TestBackForwardList \
     7        Programs/WebKit2GObjectAPITests/TestContextMenu \
     8        Programs/WebKit2GObjectAPITests/TestCookieManager \
     9        Programs/WebKit2GObjectAPITests/TestDOMNode \
     10        Programs/WebKit2GObjectAPITests/TestDownloads \
     11        Programs/WebKit2GObjectAPITests/TestFrame \
     12        Programs/WebKit2GObjectAPITests/TestInspector \
     13        Programs/WebKit2GObjectAPITests/TestInspectorServer \
     14        Programs/WebKit2GObjectAPITests/TestLoaderClient \
     15        Programs/WebKit2GObjectAPITests/TestPrinting \
     16        Programs/WebKit2GObjectAPITests/TestResources \
     17        Programs/WebKit2GObjectAPITests/TestSSL \
     18        Programs/WebKit2GObjectAPITests/TestUIClient \
     19        Programs/WebKit2GObjectAPITests/TestWebExtensions \
     20        Programs/WebKit2GObjectAPITests/TestWebKitVersion \
     21        Programs/WebKit2GObjectAPITests/TestWebKitFaviconDatabase \
     22        Programs/WebKit2GObjectAPITests/TestWebKitFindController \
     23        Programs/WebKit2GObjectAPITests/TestWebKitPolicyClient \
     24        Programs/WebKit2GObjectAPITests/TestWebKitSettings \
     25        Programs/WebKit2GObjectAPITests/TestWebKitWebContext \
     26        Programs/WebKit2GObjectAPITests/TestWebKitWebView \
     27        Programs/WebKit2GObjectAPITests/TestWebKitWebViewGroup \
     28        Programs/WebKit2GObjectAPITests/TestWebViewEditor
    2929
    3030noinst_PROGRAMS += $(TEST_PROGS)
    3131
    3232if HAVE_ATSPI2
    33 TEST_PROGS += Programs/WebKit2APITests/TestWebKitAccessibility
    34 
    35 noinst_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer
     33TEST_PROGS += Programs/WebKit2GObjectAPITests/TestWebKitAccessibility
     34
     35noinst_PROGRAMS += Programs/WebKit2GObjectAPITests/AccessibilityTestServer
    3636endif
    3737
     
    160160        Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js
    161161
    162 Programs_WebKit2APITests_TestWebKitWebContext_SOURCES = \
     162Programs_WebKit2GObjectAPITests_TestWebKitWebContext_SOURCES = \
    163163        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp
    164 Programs_WebKit2APITests_TestWebKitWebContext_CPPFLAGS = $(webkit2_tests_cppflags)
    165 Programs_WebKit2APITests_TestWebKitWebContext_LDADD = $(webkit2_tests_ldadd)
    166 Programs_WebKit2APITests_TestWebKitWebContext_LDFLAGS = $(webkit2_tests_ldflags)
    167 
    168 Programs_WebKit2APITests_TestWebKitWebView_SOURCES = \
     164Programs_WebKit2GObjectAPITests_TestWebKitWebContext_CPPFLAGS = $(webkit2_tests_cppflags)
     165Programs_WebKit2GObjectAPITests_TestWebKitWebContext_LDADD = $(webkit2_tests_ldadd)
     166Programs_WebKit2GObjectAPITests_TestWebKitWebContext_LDFLAGS = $(webkit2_tests_ldflags)
     167
     168Programs_WebKit2GObjectAPITests_TestWebKitWebView_SOURCES = \
    169169        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp
    170 Programs_WebKit2APITests_TestWebKitWebView_CPPFLAGS = $(webkit2_tests_cppflags)
    171 Programs_WebKit2APITests_TestWebKitWebView_LDADD = $(webkit2_tests_ldadd)
    172 Programs_WebKit2APITests_TestWebKitWebView_LDFLAGS = $(webkit2_tests_ldflags)
    173 
    174 Programs_WebKit2APITests_TestLoaderClient_SOURCES = \
     170Programs_WebKit2GObjectAPITests_TestWebKitWebView_CPPFLAGS = $(webkit2_tests_cppflags)
     171Programs_WebKit2GObjectAPITests_TestWebKitWebView_LDADD = $(webkit2_tests_ldadd)
     172Programs_WebKit2GObjectAPITests_TestWebKitWebView_LDFLAGS = $(webkit2_tests_ldflags)
     173
     174Programs_WebKit2GObjectAPITests_TestLoaderClient_SOURCES = \
    175175        Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp
    176 Programs_WebKit2APITests_TestLoaderClient_CPPFLAGS = $(webkit2_tests_cppflags)
    177 Programs_WebKit2APITests_TestLoaderClient_LDADD = $(webkit2_tests_ldadd)
    178 Programs_WebKit2APITests_TestLoaderClient_LDFLAGS = $(webkit2_tests_ldflags)
    179 
    180 Programs_WebKit2APITests_TestWebKitSettings_SOURCES = \
     176Programs_WebKit2GObjectAPITests_TestLoaderClient_CPPFLAGS = $(webkit2_tests_cppflags)
     177Programs_WebKit2GObjectAPITests_TestLoaderClient_LDADD = $(webkit2_tests_ldadd)
     178Programs_WebKit2GObjectAPITests_TestLoaderClient_LDFLAGS = $(webkit2_tests_ldflags)
     179
     180Programs_WebKit2GObjectAPITests_TestWebKitSettings_SOURCES = \
    181181        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp
    182 Programs_WebKit2APITests_TestWebKitSettings_CPPFLAGS = $(webkit2_tests_cppflags)
    183 Programs_WebKit2APITests_TestWebKitSettings_LDADD = $(webkit2_tests_ldadd)
    184 Programs_WebKit2APITests_TestWebKitSettings_LDFLAGS = $(webkit2_tests_ldflags)
    185 
    186 Programs_WebKit2APITests_InspectorTestServer_SOURCES = \
     182Programs_WebKit2GObjectAPITests_TestWebKitSettings_CPPFLAGS = $(webkit2_tests_cppflags)
     183Programs_WebKit2GObjectAPITests_TestWebKitSettings_LDADD = $(webkit2_tests_ldadd)
     184Programs_WebKit2GObjectAPITests_TestWebKitSettings_LDFLAGS = $(webkit2_tests_ldflags)
     185
     186Programs_WebKit2GObjectAPITests_InspectorTestServer_SOURCES = \
    187187        Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp
    188 Programs_WebKit2APITests_InspectorTestServer_CPPFLAGS = $(webkit2_tests_cppflags)
    189 Programs_WebKit2APITests_InspectorTestServer_LDADD = $(webkit2_tests_ldadd)
    190 Programs_WebKit2APITests_InspectorTestServer_LDFLAGS = $(webkit2_tests_ldflags)
    191 
    192 Programs_WebKit2APITests_TestBackForwardList_SOURCES = \
     188Programs_WebKit2GObjectAPITests_InspectorTestServer_CPPFLAGS = $(webkit2_tests_cppflags)
     189Programs_WebKit2GObjectAPITests_InspectorTestServer_LDADD = $(webkit2_tests_ldadd)
     190Programs_WebKit2GObjectAPITests_InspectorTestServer_LDFLAGS = $(webkit2_tests_ldflags)
     191
     192Programs_WebKit2GObjectAPITests_TestBackForwardList_SOURCES = \
    193193        Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp
    194 Programs_WebKit2APITests_TestBackForwardList_CPPFLAGS = $(webkit2_tests_cppflags)
    195 Programs_WebKit2APITests_TestBackForwardList_LDADD = $(webkit2_tests_ldadd)
    196 Programs_WebKit2APITests_TestBackForwardList_LDFLAGS = $(webkit2_tests_ldflags)
    197 
    198 Programs_WebKit2APITests_TestWebKitPolicyClient_SOURCES = \
     194Programs_WebKit2GObjectAPITests_TestBackForwardList_CPPFLAGS = $(webkit2_tests_cppflags)
     195Programs_WebKit2GObjectAPITests_TestBackForwardList_LDADD = $(webkit2_tests_ldadd)
     196Programs_WebKit2GObjectAPITests_TestBackForwardList_LDFLAGS = $(webkit2_tests_ldflags)
     197
     198Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_SOURCES = \
    199199        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp
    200 Programs_WebKit2APITests_TestWebKitPolicyClient_CPPFLAGS = $(webkit2_tests_cppflags)
    201 Programs_WebKit2APITests_TestWebKitPolicyClient_LDADD = $(webkit2_tests_ldadd)
    202 Programs_WebKit2APITests_TestWebKitPolicyClient_LDFLAGS = $(webkit2_tests_ldflags)
     200Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_CPPFLAGS = $(webkit2_tests_cppflags)
     201Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_LDADD = $(webkit2_tests_ldadd)
     202Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_LDFLAGS = $(webkit2_tests_ldflags)
    203203
    204204if HAVE_ATSPI2
    205 Programs_WebKit2APITests_AccessibilityTestServer_SOURCES = \
     205Programs_WebKit2GObjectAPITests_AccessibilityTestServer_SOURCES = \
    206206        Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp
    207 Programs_WebKit2APITests_AccessibilityTestServer_CPPFLAGS = $(webkit2_tests_cppflags)
    208 Programs_WebKit2APITests_AccessibilityTestServer_LDADD = $(webkit2_tests_ldadd)
    209 Programs_WebKit2APITests_AccessibilityTestServer_LDFLAGS = $(webkit2_tests_ldflags)
    210 
    211 Programs_WebKit2APITests_TestWebKitAccessibility_SOURCES = \
     207Programs_WebKit2GObjectAPITests_AccessibilityTestServer_CPPFLAGS = $(webkit2_tests_cppflags)
     208Programs_WebKit2GObjectAPITests_AccessibilityTestServer_LDADD = $(webkit2_tests_ldadd)
     209Programs_WebKit2GObjectAPITests_AccessibilityTestServer_LDFLAGS = $(webkit2_tests_ldflags)
     210
     211Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_SOURCES = \
    212212        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp
    213 Programs_WebKit2APITests_TestWebKitAccessibility_CPPFLAGS = $(webkit2_tests_cppflags) $(ATSPI2_CFLAGS)
    214 Programs_WebKit2APITests_TestWebKitAccessibility_LDADD = $(webkit2_tests_ldadd) $(ATSPI2_LIBS)
    215 Programs_WebKit2APITests_TestWebKitAccessibility_LDFLAGS = $(webkit2_tests_ldflags)
     213Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_CPPFLAGS = $(webkit2_tests_cppflags) $(ATSPI2_CFLAGS)
     214Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_LDADD = $(webkit2_tests_ldadd) $(ATSPI2_LIBS)
     215Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_LDFLAGS = $(webkit2_tests_ldflags)
    216216endif
    217217
    218 Programs_WebKit2APITests_TestDownloads_SOURCES = \
     218Programs_WebKit2GObjectAPITests_TestDownloads_SOURCES = \
    219219        Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp
    220 Programs_WebKit2APITests_TestDownloads_CPPFLAGS = $(webkit2_tests_cppflags)
    221 Programs_WebKit2APITests_TestDownloads_LDADD = $(webkit2_tests_ldadd)
    222 Programs_WebKit2APITests_TestDownloads_LDFLAGS = $(webkit2_tests_ldflags)
    223 
    224 Programs_WebKit2APITests_TestWebViewEditor_SOURCES = \
     220Programs_WebKit2GObjectAPITests_TestDownloads_CPPFLAGS = $(webkit2_tests_cppflags)
     221Programs_WebKit2GObjectAPITests_TestDownloads_LDADD = $(webkit2_tests_ldadd)
     222Programs_WebKit2GObjectAPITests_TestDownloads_LDFLAGS = $(webkit2_tests_ldflags)
     223
     224Programs_WebKit2GObjectAPITests_TestWebViewEditor_SOURCES = \
    225225        Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp
    226 Programs_WebKit2APITests_TestWebViewEditor_CPPFLAGS = $(webkit2_tests_cppflags)
    227 Programs_WebKit2APITests_TestWebViewEditor_LDADD = $(webkit2_tests_ldadd)
    228 Programs_WebKit2APITests_TestWebViewEditor_LDFLAGS = $(webkit2_tests_ldflags)
    229 
    230 Programs_WebKit2APITests_TestPrinting_SOURCES = \
     226Programs_WebKit2GObjectAPITests_TestWebViewEditor_CPPFLAGS = $(webkit2_tests_cppflags)
     227Programs_WebKit2GObjectAPITests_TestWebViewEditor_LDADD = $(webkit2_tests_ldadd)
     228Programs_WebKit2GObjectAPITests_TestWebViewEditor_LDFLAGS = $(webkit2_tests_ldflags)
     229
     230Programs_WebKit2GObjectAPITests_TestPrinting_SOURCES = \
    231231        Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp
    232 Programs_WebKit2APITests_TestPrinting_CPPFLAGS = $(webkit2_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS)
    233 Programs_WebKit2APITests_TestPrinting_LDADD = $(webkit2_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS)
    234 Programs_WebKit2APITests_TestPrinting_LDFLAGS = $(webkit2_tests_ldflags)
    235 
    236 Programs_WebKit2APITests_TestWebKitFaviconDatabase_SOURCES = \
     232Programs_WebKit2GObjectAPITests_TestPrinting_CPPFLAGS = $(webkit2_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS)
     233Programs_WebKit2GObjectAPITests_TestPrinting_LDADD = $(webkit2_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS)
     234Programs_WebKit2GObjectAPITests_TestPrinting_LDFLAGS = $(webkit2_tests_ldflags)
     235
     236Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_SOURCES = \
    237237        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp
    238 Programs_WebKit2APITests_TestWebKitFaviconDatabase_CPPFLAGS = $(webkit2_tests_cppflags)
    239 Programs_WebKit2APITests_TestWebKitFaviconDatabase_LDADD = $(webkit2_tests_ldadd)
    240 Programs_WebKit2APITests_TestWebKitFaviconDatabase_LDFLAGS = $(webkit2_tests_ldflags)
    241 
    242 Programs_WebKit2APITests_TestWebKitFindController_SOURCES = \
     238Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_CPPFLAGS = $(webkit2_tests_cppflags)
     239Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_LDADD = $(webkit2_tests_ldadd)
     240Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_LDFLAGS = $(webkit2_tests_ldflags)
     241
     242Programs_WebKit2GObjectAPITests_TestWebKitFindController_SOURCES = \
    243243        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp
    244 Programs_WebKit2APITests_TestWebKitFindController_CPPFLAGS = $(webkit2_tests_cppflags)
    245 Programs_WebKit2APITests_TestWebKitFindController_LDADD = $(webkit2_tests_ldadd)
    246 Programs_WebKit2APITests_TestWebKitFindController_LDFLAGS = $(webkit2_tests_ldflags)
    247 
    248 Programs_WebKit2APITests_TestResources_SOURCES = \
     244Programs_WebKit2GObjectAPITests_TestWebKitFindController_CPPFLAGS = $(webkit2_tests_cppflags)
     245Programs_WebKit2GObjectAPITests_TestWebKitFindController_LDADD = $(webkit2_tests_ldadd)
     246Programs_WebKit2GObjectAPITests_TestWebKitFindController_LDFLAGS = $(webkit2_tests_ldflags)
     247
     248Programs_WebKit2GObjectAPITests_TestResources_SOURCES = \
    249249        Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp
    250 Programs_WebKit2APITests_TestResources_CPPFLAGS = $(webkit2_tests_cppflags)
    251 Programs_WebKit2APITests_TestResources_LDADD = $(webkit2_tests_ldadd)
    252 Programs_WebKit2APITests_TestResources_LDFLAGS = $(webkit2_tests_ldflags)
    253 
    254 Programs_WebKit2APITests_TestCookieManager_SOURCES = \
     250Programs_WebKit2GObjectAPITests_TestResources_CPPFLAGS = $(webkit2_tests_cppflags)
     251Programs_WebKit2GObjectAPITests_TestResources_LDADD = $(webkit2_tests_ldadd)
     252Programs_WebKit2GObjectAPITests_TestResources_LDFLAGS = $(webkit2_tests_ldflags)
     253
     254Programs_WebKit2GObjectAPITests_TestCookieManager_SOURCES = \
    255255        Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp
    256 Programs_WebKit2APITests_TestCookieManager_CPPFLAGS = $(webkit2_tests_cppflags)
    257 Programs_WebKit2APITests_TestCookieManager_LDADD = $(webkit2_tests_ldadd)
    258 Programs_WebKit2APITests_TestCookieManager_LDFLAGS = $(webkit2_tests_ldflags)
    259 
    260 Programs_WebKit2APITests_TestInspector_SOURCES = \
     256Programs_WebKit2GObjectAPITests_TestCookieManager_CPPFLAGS = $(webkit2_tests_cppflags)
     257Programs_WebKit2GObjectAPITests_TestCookieManager_LDADD = $(webkit2_tests_ldadd)
     258Programs_WebKit2GObjectAPITests_TestCookieManager_LDFLAGS = $(webkit2_tests_ldflags)
     259
     260Programs_WebKit2GObjectAPITests_TestInspector_SOURCES = \
    261261        Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp
    262 Programs_WebKit2APITests_TestInspector_CPPFLAGS = \
     262Programs_WebKit2GObjectAPITests_TestInspector_CPPFLAGS = \
    263263        $(webkit2_tests_cppflags)
    264 Programs_WebKit2APITests_TestInspector_LDADD = $(webkit2_tests_ldadd)
    265 Programs_WebKit2APITests_TestInspector_LDFLAGS = $(webkit2_tests_ldflags)
    266 
    267 Programs_WebKit2APITests_TestInspectorServer_SOURCES = \
     264Programs_WebKit2GObjectAPITests_TestInspector_LDADD = $(webkit2_tests_ldadd)
     265Programs_WebKit2GObjectAPITests_TestInspector_LDFLAGS = $(webkit2_tests_ldflags)
     266
     267Programs_WebKit2GObjectAPITests_TestInspectorServer_SOURCES = \
    268268        Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp
    269 Programs_WebKit2APITests_TestInspectorServer_CPPFLAGS = $(webkit2_tests_cppflags)
    270 Programs_WebKit2APITests_TestInspectorServer_LDADD = $(webkit2_tests_ldadd)
    271 Programs_WebKit2APITests_TestInspectorServer_LDFLAGS = $(webkit2_tests_ldflags)
    272 
    273 Programs_WebKit2APITests_TestWebKitVersion_SOURCES = \
     269Programs_WebKit2GObjectAPITests_TestInspectorServer_CPPFLAGS = $(webkit2_tests_cppflags)
     270Programs_WebKit2GObjectAPITests_TestInspectorServer_LDADD = $(webkit2_tests_ldadd)
     271Programs_WebKit2GObjectAPITests_TestInspectorServer_LDFLAGS = $(webkit2_tests_ldflags)
     272
     273Programs_WebKit2GObjectAPITests_TestWebKitVersion_SOURCES = \
    274274        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp
    275 Programs_WebKit2APITests_TestWebKitVersion_CPPFLAGS = $(webkit2_tests_cppflags)
    276 Programs_WebKit2APITests_TestWebKitVersion_LDADD = $(webkit2_tests_ldadd)
    277 Programs_WebKit2APITests_TestWebKitVersion_LDFLAGS = $(webkit2_tests_ldflags)
    278 
    279 Programs_WebKit2APITests_TestContextMenu_SOURCES = \
     275Programs_WebKit2GObjectAPITests_TestWebKitVersion_CPPFLAGS = $(webkit2_tests_cppflags)
     276Programs_WebKit2GObjectAPITests_TestWebKitVersion_LDADD = $(webkit2_tests_ldadd)
     277Programs_WebKit2GObjectAPITests_TestWebKitVersion_LDFLAGS = $(webkit2_tests_ldflags)
     278
     279Programs_WebKit2GObjectAPITests_TestContextMenu_SOURCES = \
    280280        Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp
    281 Programs_WebKit2APITests_TestContextMenu_CPPFLAGS = $(webkit2_tests_cppflags)
    282 Programs_WebKit2APITests_TestContextMenu_LDADD = $(webkit2_tests_ldadd)
    283 Programs_WebKit2APITests_TestContextMenu_LDFLAGS = $(webkit2_tests_ldflags)
    284 
    285 Programs_WebKit2APITests_TestSSL_SOURCES = \
     281Programs_WebKit2GObjectAPITests_TestContextMenu_CPPFLAGS = $(webkit2_tests_cppflags)
     282Programs_WebKit2GObjectAPITests_TestContextMenu_LDADD = $(webkit2_tests_ldadd)
     283Programs_WebKit2GObjectAPITests_TestContextMenu_LDFLAGS = $(webkit2_tests_ldflags)
     284
     285Programs_WebKit2GObjectAPITests_TestSSL_SOURCES = \
    286286        Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp
    287 Programs_WebKit2APITests_TestSSL_CPPFLAGS = $(webkit2_tests_cppflags)
    288 Programs_WebKit2APITests_TestSSL_LDADD = $(webkit2_tests_ldadd)
    289 Programs_WebKit2APITests_TestSSL_LDFLAGS = $(webkit2_tests_ldflags)
    290 
    291 Programs_WebKit2APITests_TestWebExtensions_SOURCES = \
     287Programs_WebKit2GObjectAPITests_TestSSL_CPPFLAGS = $(webkit2_tests_cppflags)
     288Programs_WebKit2GObjectAPITests_TestSSL_LDADD = $(webkit2_tests_ldadd)
     289Programs_WebKit2GObjectAPITests_TestSSL_LDFLAGS = $(webkit2_tests_ldflags)
     290
     291Programs_WebKit2GObjectAPITests_TestWebExtensions_SOURCES = \
    292292        Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp
    293 Programs_WebKit2APITests_TestWebExtensions_CPPFLAGS = $(webkit2_tests_cppflags)
    294 Programs_WebKit2APITests_TestWebExtensions_LDADD = $(webkit2_tests_ldadd)
    295 Programs_WebKit2APITests_TestWebExtensions_LDFLAGS = $(webkit2_tests_ldflags)
    296 
    297 Programs_WebKit2APITests_TestWebKitWebViewGroup_SOURCES = \
     293Programs_WebKit2GObjectAPITests_TestWebExtensions_CPPFLAGS = $(webkit2_tests_cppflags)
     294Programs_WebKit2GObjectAPITests_TestWebExtensions_LDADD = $(webkit2_tests_ldadd)
     295Programs_WebKit2GObjectAPITests_TestWebExtensions_LDFLAGS = $(webkit2_tests_ldflags)
     296
     297Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_SOURCES = \
    298298        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp
    299 Programs_WebKit2APITests_TestWebKitWebViewGroup_CPPFLAGS = $(webkit2_tests_cppflags)
    300 Programs_WebKit2APITests_TestWebKitWebViewGroup_LDADD = $(webkit2_tests_ldadd)
    301 Programs_WebKit2APITests_TestWebKitWebViewGroup_LDFLAGS = $(webkit2_tests_ldflags)
    302 
    303 Programs_WebKit2APITests_TestDOMNode_SOURCES = \
     299Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_CPPFLAGS = $(webkit2_tests_cppflags)
     300Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_LDADD = $(webkit2_tests_ldadd)
     301Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_LDFLAGS = $(webkit2_tests_ldflags)
     302
     303Programs_WebKit2GObjectAPITests_TestDOMNode_SOURCES = \
    304304        Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp
    305 Programs_WebKit2APITests_TestDOMNode_CPPFLAGS = $(webkit2_tests_cppflags)
    306 Programs_WebKit2APITests_TestDOMNode_LDADD = $(webkit2_tests_ldadd)
    307 Programs_WebKit2APITests_TestDOMNode_LDFLAGS = $(webkit2_tests_ldflags)
    308 
    309 Programs_WebKit2APITests_TestFrame_SOURCES = \
     305Programs_WebKit2GObjectAPITests_TestDOMNode_CPPFLAGS = $(webkit2_tests_cppflags)
     306Programs_WebKit2GObjectAPITests_TestDOMNode_LDADD = $(webkit2_tests_ldadd)
     307Programs_WebKit2GObjectAPITests_TestDOMNode_LDFLAGS = $(webkit2_tests_ldflags)
     308
     309Programs_WebKit2GObjectAPITests_TestFrame_SOURCES = \
    310310        Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp
    311 Programs_WebKit2APITests_TestFrame_CPPFLAGS = $(webkit2_tests_cppflags)
    312 Programs_WebKit2APITests_TestFrame_LDADD = $(webkit2_tests_ldadd)
    313 Programs_WebKit2APITests_TestFrame_LDFLAGS = $(webkit2_tests_ldflags)
    314 
    315 Programs_WebKit2APITests_TestAuthentication_SOURCES = \
     311Programs_WebKit2GObjectAPITests_TestFrame_CPPFLAGS = $(webkit2_tests_cppflags)
     312Programs_WebKit2GObjectAPITests_TestFrame_LDADD = $(webkit2_tests_ldadd)
     313Programs_WebKit2GObjectAPITests_TestFrame_LDFLAGS = $(webkit2_tests_ldflags)
     314
     315Programs_WebKit2GObjectAPITests_TestAuthentication_SOURCES = \
    316316        Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp
    317 Programs_WebKit2APITests_TestAuthentication_CPPFLAGS = $(webkit2_tests_cppflags)
    318 Programs_WebKit2APITests_TestAuthentication_LDADD = $(webkit2_tests_ldadd)
    319 Programs_WebKit2APITests_TestAuthentication_LDFLAGS = $(webkit2_tests_ldflags)
    320 
    321 Programs_WebKit2APITests_TestUIClient_SOURCES = \
     317Programs_WebKit2GObjectAPITests_TestAuthentication_CPPFLAGS = $(webkit2_tests_cppflags)
     318Programs_WebKit2GObjectAPITests_TestAuthentication_LDADD = $(webkit2_tests_ldadd)
     319Programs_WebKit2GObjectAPITests_TestAuthentication_LDFLAGS = $(webkit2_tests_ldflags)
     320
     321Programs_WebKit2GObjectAPITests_TestUIClient_SOURCES = \
    322322        Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp
    323 Programs_WebKit2APITests_TestUIClient_CPPFLAGS = $(webkit2_tests_cppflags)
    324 Programs_WebKit2APITests_TestUIClient_LDADD = $(webkit2_tests_ldadd)
    325 Programs_WebKit2APITests_TestUIClient_LDFLAGS = $(webkit2_tests_ldflags)
     323Programs_WebKit2GObjectAPITests_TestUIClient_CPPFLAGS = $(webkit2_tests_cppflags)
     324Programs_WebKit2GObjectAPITests_TestUIClient_LDADD = $(webkit2_tests_ldadd)
     325Programs_WebKit2GObjectAPITests_TestUIClient_LDFLAGS = $(webkit2_tests_ldflags)
    326326
    327327endif # ENABLE_WEBKIT2
  • trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp

    r155985 r161182  
    8080{
    8181    // Prepare argv[] for spawning the server process.
    82     GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2APITests", gTestServerAppName, NULL));
     82    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", gTestServerAppName, NULL));
    8383
    8484    // We install a handler to ensure that we kill the child process
  • trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp

    r160270 r161182  
    8888{
    8989    // Prepare argv[] for spawning the server process.
    90     GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2APITests", kTestServerAppName, NULL));
     90    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", kTestServerAppName, NULL));
    9191
    9292    char* testServerArgv[2];
  • trunk/Tools/ChangeLog

    r161171 r161182  
     12013-12-30  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Make the output directory of GObject unit tests binaries consistent with the CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=126297
     5
     6        Reviewed by Philippe Normand.
     7
     8        * Scripts/run-gtk-tests: Looks for the tests in the new directories.
     9        (TestRunner): Ditto.
     10        (TestRunner._run_test): Ditto.
     11
    1122013-12-30  Alexey Proskuryakov  <ap@apple.com>
    213
  • trunk/Tools/Scripts/run-gtk-tests

    r161138 r161182  
    5959
    6060class TestRunner:
    61     TEST_DIRS = [ "unittests", "WebKit2APITests", "TestWebKitAPI" ]
     61    TEST_DIRS = [ "WebKit1GObjectAPITests", "WebKit2GObjectAPITests", "TestWebKitAPI" ]
    6262
    6363    SKIPPED = [
    64         SkippedTest("unittests/testdownload", "/webkit/download/not-found", "Test fails in GTK Linux 64-bit Release bot", 82329),
    65         SkippedTest("unittests/testwebinspector", "/webkit/webinspector/close-and-inspect", "Test is flaky in GTK Linux 32-bit Release bot", 82869),
    66         SkippedTest("unittests/testwebresource", "/webkit/webresource/loading", "Test fails", 104689),
    67         SkippedTest("unittests/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
    68         SkippedTest("unittests/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
    69         SkippedTest("WebKit2APITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
    70         SkippedTest("WebKit2APITests/TestUIClient", "/webkit2/WebKitWebView/mouse-target", "Test times out after r150890", 117689),
    71         SkippedTest("WebKit2APITests/TestAuthentication", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
    72         SkippedTest("WebKit2APITests/TestContextMenu", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
     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),
    7373        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
    7474        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),
     
    8787        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068),
    8888        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
    89         SkippedTest("WebKit2APITests/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),
     89        SkippedTest("WebKit2GObjectAPITests/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),
    9090    ]
    9191
     
    360360
    361361    def _run_test(self, test_program):
    362         if "unittests" in test_program or "WebKit2APITests" in test_program:
     362        if "GObjectAPITest" in test_program:
    363363            return self._run_test_glib(test_program)
    364364
Note: See TracChangeset for help on using the changeset viewer.