Changeset 161182 in webkit
- Timestamp:
- Dec 31, 2013 8:14:39 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/gtk/ChangeLog
r161095 r161182 1 2013-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 1 10 2013-12-26 Martin Robinson <mrobinson@igalia.com> 2 11 -
trunk/Source/WebKit/gtk/tests/GNUmakefile.am
r155918 r161182 33 33 if ENABLE_WEBKIT1 34 34 noinst_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/testcopyandpaste35 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 63 63 endif 64 64 65 65 # Add additional tests here 66 Programs_ unittests_testapplicationcache_SOURCES = Source/WebKit/gtk/tests/testapplicationcache.c67 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.c72 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.c77 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.c82 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.c87 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.c92 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.c97 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.c102 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.c107 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.c112 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.c117 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.c122 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.c127 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.c132 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.c137 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.c142 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.c147 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.c152 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.c157 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.c162 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.c167 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.c172 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.c177 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.c181 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.c185 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.c190 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.c194 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 \66 Programs_WebKit1GObjectAPITests_testapplicationcache_SOURCES = Source/WebKit/gtk/tests/testapplicationcache.c 67 Programs_WebKit1GObjectAPITests_testapplicationcache_CFLAGS = $(webkit_tests_cflags) 68 Programs_WebKit1GObjectAPITests_testapplicationcache_LDADD = $(webkit_tests_ldadd) 69 Programs_WebKit1GObjectAPITests_testapplicationcache_LDFLAGS = $(webkit_tests_ldflags) 70 71 Programs_WebKit1GObjectAPITests_testcontextmenu_SOURCES = Source/WebKit/gtk/tests/testcontextmenu.c 72 Programs_WebKit1GObjectAPITests_testcontextmenu_CFLAGS = $(webkit_tests_cflags) 73 Programs_WebKit1GObjectAPITests_testcontextmenu_LDADD = $(webkit_tests_ldadd) 74 Programs_WebKit1GObjectAPITests_testcontextmenu_LDFLAGS = $(webkit_tests_ldflags) 75 76 Programs_WebKit1GObjectAPITests_testdomdocument_SOURCES = Source/WebKit/gtk/tests/testdomdocument.c 77 Programs_WebKit1GObjectAPITests_testdomdocument_CFLAGS = $(webkit_tests_cflags) 78 Programs_WebKit1GObjectAPITests_testdomdocument_LDADD = $(webkit_tests_ldadd) 79 Programs_WebKit1GObjectAPITests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags) 80 81 Programs_WebKit1GObjectAPITests_testdomdomwindow_SOURCES = Source/WebKit/gtk/tests/testdomdomwindow.c 82 Programs_WebKit1GObjectAPITests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags) 83 Programs_WebKit1GObjectAPITests_testdomdomwindow_LDADD = $(webkit_tests_ldadd) 84 Programs_WebKit1GObjectAPITests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags) 85 86 Programs_WebKit1GObjectAPITests_testdomnode_SOURCES = Source/WebKit/gtk/tests/testdomnode.c 87 Programs_WebKit1GObjectAPITests_testdomnode_CFLAGS = $(webkit_tests_cflags) 88 Programs_WebKit1GObjectAPITests_testdomnode_LDADD = $(webkit_tests_ldadd) 89 Programs_WebKit1GObjectAPITests_testdomnode_LDFLAGS = $(webkit_tests_ldflags) 90 91 Programs_WebKit1GObjectAPITests_testhttpbackend_SOURCES = Source/WebKit/gtk/tests/testhttpbackend.c 92 Programs_WebKit1GObjectAPITests_testhttpbackend_CFLAGS = $(webkit_tests_cflags) 93 Programs_WebKit1GObjectAPITests_testhttpbackend_LDADD = $(webkit_tests_ldadd) 94 Programs_WebKit1GObjectAPITests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags) 95 96 Programs_WebKit1GObjectAPITests_testfavicondatabase_SOURCES = Source/WebKit/gtk/tests/testfavicondatabase.c Source/WebKit/gtk/tests/test_utils.c 97 Programs_WebKit1GObjectAPITests_testfavicondatabase_CFLAGS = $(webkit_tests_cflags) 98 Programs_WebKit1GObjectAPITests_testfavicondatabase_LDADD = $(webkit_tests_ldadd) 99 Programs_WebKit1GObjectAPITests_testfavicondatabase_LDFLAGS = $(webkit_tests_ldflags) 100 101 Programs_WebKit1GObjectAPITests_testglobals_SOURCES = Source/WebKit/gtk/tests/testglobals.c 102 Programs_WebKit1GObjectAPITests_testglobals_CFLAGS = $(webkit_tests_cflags) 103 Programs_WebKit1GObjectAPITests_testglobals_LDADD = $(webkit_tests_ldadd) 104 Programs_WebKit1GObjectAPITests_testglobals_LDFLAGS = $(webkit_tests_ldflags) 105 106 Programs_WebKit1GObjectAPITests_testloading_SOURCES = Source/WebKit/gtk/tests/testloading.c 107 Programs_WebKit1GObjectAPITests_testloading_CFLAGS = $(webkit_tests_cflags) 108 Programs_WebKit1GObjectAPITests_testloading_LDADD = $(webkit_tests_ldadd) 109 Programs_WebKit1GObjectAPITests_testloading_LDFLAGS = $(webkit_tests_ldflags) 110 111 Programs_WebKit1GObjectAPITests_testmimehandling_SOURCES = Source/WebKit/gtk/tests/testmimehandling.c Source/WebKit/gtk/tests/test_utils.c 112 Programs_WebKit1GObjectAPITests_testmimehandling_CFLAGS = $(webkit_tests_cflags) 113 Programs_WebKit1GObjectAPITests_testmimehandling_LDADD = $(webkit_tests_ldadd) 114 Programs_WebKit1GObjectAPITests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags) 115 116 Programs_WebKit1GObjectAPITests_testnetworkrequest_SOURCES = Source/WebKit/gtk/tests/testnetworkrequest.c 117 Programs_WebKit1GObjectAPITests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags) 118 Programs_WebKit1GObjectAPITests_testnetworkrequest_LDADD = $(webkit_tests_ldadd) 119 Programs_WebKit1GObjectAPITests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags) 120 121 Programs_WebKit1GObjectAPITests_testnetworkresponse_SOURCES = Source/WebKit/gtk/tests/testnetworkresponse.c 122 Programs_WebKit1GObjectAPITests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags) 123 Programs_WebKit1GObjectAPITests_testnetworkresponse_LDADD = $(webkit_tests_ldadd) 124 Programs_WebKit1GObjectAPITests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags) 125 126 Programs_WebKit1GObjectAPITests_testwebframe_SOURCES = Source/WebKit/gtk/tests/testwebframe.c 127 Programs_WebKit1GObjectAPITests_testwebframe_CFLAGS = $(webkit_tests_cflags) 128 Programs_WebKit1GObjectAPITests_testwebframe_LDADD = $(webkit_tests_ldadd) 129 Programs_WebKit1GObjectAPITests_testwebframe_LDFLAGS = $(webkit_tests_ldflags) 130 131 Programs_WebKit1GObjectAPITests_testwebplugindatabase_SOURCES = Source/WebKit/gtk/tests/testwebplugindatabase.c 132 Programs_WebKit1GObjectAPITests_testwebplugindatabase_CFLAGS = -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" $(webkit_tests_cflags) 133 Programs_WebKit1GObjectAPITests_testwebplugindatabase_LDADD = $(webkit_tests_ldadd) 134 Programs_WebKit1GObjectAPITests_testwebplugindatabase_LDFLAGS = $(webkit_tests_ldflags) 135 136 Programs_WebKit1GObjectAPITests_testwebbackforwardlist_SOURCES = Source/WebKit/gtk/tests/testwebbackforwardlist.c 137 Programs_WebKit1GObjectAPITests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags) 138 Programs_WebKit1GObjectAPITests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd) 139 Programs_WebKit1GObjectAPITests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags) 140 141 Programs_WebKit1GObjectAPITests_testwebhistoryitem_SOURCES = Source/WebKit/gtk/tests/testwebhistoryitem.c 142 Programs_WebKit1GObjectAPITests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags) 143 Programs_WebKit1GObjectAPITests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd) 144 Programs_WebKit1GObjectAPITests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags) 145 146 Programs_WebKit1GObjectAPITests_testwindow_SOURCES = Source/WebKit/gtk/tests/testwindow.c 147 Programs_WebKit1GObjectAPITests_testwindow_CFLAGS = $(webkit_tests_cflags) 148 Programs_WebKit1GObjectAPITests_testwindow_LDADD = $(webkit_tests_ldadd) 149 Programs_WebKit1GObjectAPITests_testwindow_LDFLAGS = $(webkit_tests_ldflags) 150 151 Programs_WebKit1GObjectAPITests_testdownload_SOURCES = Source/WebKit/gtk/tests/testdownload.c 152 Programs_WebKit1GObjectAPITests_testdownload_CFLAGS = $(webkit_tests_cflags) 153 Programs_WebKit1GObjectAPITests_testdownload_LDADD = $(webkit_tests_ldadd) 154 Programs_WebKit1GObjectAPITests_testdownload_LDFLAGS = $(webkit_tests_ldflags) 155 156 Programs_WebKit1GObjectAPITests_testatk_SOURCES = Source/WebKit/gtk/tests/testatk.c 157 Programs_WebKit1GObjectAPITests_testatk_CFLAGS = $(webkit_tests_cflags) 158 Programs_WebKit1GObjectAPITests_testatk_LDADD = $(webkit_tests_ldadd) 159 Programs_WebKit1GObjectAPITests_testatk_LDFLAGS = $(webkit_tests_ldflags) 160 161 Programs_WebKit1GObjectAPITests_testatkroles_SOURCES = Source/WebKit/gtk/tests/testatkroles.c 162 Programs_WebKit1GObjectAPITests_testatkroles_CFLAGS = $(webkit_tests_cflags) 163 Programs_WebKit1GObjectAPITests_testatkroles_LDADD = $(webkit_tests_ldadd) 164 Programs_WebKit1GObjectAPITests_testatkroles_LDFLAGS = $(webkit_tests_ldflags) 165 166 Programs_WebKit1GObjectAPITests_testwebinspector_SOURCES = Source/WebKit/gtk/tests/testwebinspector.c Source/WebKit/gtk/tests/test_utils.c 167 Programs_WebKit1GObjectAPITests_testwebinspector_CFLAGS = $(webkit_tests_cflags) 168 Programs_WebKit1GObjectAPITests_testwebinspector_LDADD = $(webkit_tests_ldadd) 169 Programs_WebKit1GObjectAPITests_testwebinspector_LDFLAGS = $(webkit_tests_ldflags) 170 171 Programs_WebKit1GObjectAPITests_testwebsettings_SOURCES = Source/WebKit/gtk/tests/testwebsettings.c 172 Programs_WebKit1GObjectAPITests_testwebsettings_CFLAGS = $(webkit_tests_cflags) 173 Programs_WebKit1GObjectAPITests_testwebsettings_LDADD = $(webkit_tests_ldadd) 174 Programs_WebKit1GObjectAPITests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags) 175 176 Programs_WebKit1GObjectAPITests_testwebresource_SOURCES = Source/WebKit/gtk/tests/testwebresource.c 177 Programs_WebKit1GObjectAPITests_testwebresource_CFLAGS = $(webkit_tests_cflags) 178 Programs_WebKit1GObjectAPITests_testwebresource_LDADD = $(webkit_tests_ldadd) 179 180 Programs_WebKit1GObjectAPITests_testwebdatasource_SOURCES = Source/WebKit/gtk/tests/testwebdatasource.c 181 Programs_WebKit1GObjectAPITests_testwebdatasource_CFLAGS = $(webkit_tests_cflags) 182 Programs_WebKit1GObjectAPITests_testwebdatasource_LDADD = $(webkit_tests_ldadd) 183 184 Programs_WebKit1GObjectAPITests_testwebview_SOURCES = Source/WebKit/gtk/tests/testwebview.c Source/WebKit/gtk/tests/test_utils.c 185 Programs_WebKit1GObjectAPITests_testwebview_CFLAGS = $(webkit_tests_cflags) 186 Programs_WebKit1GObjectAPITests_testwebview_LDADD = $(webkit_tests_ldadd) 187 Programs_WebKit1GObjectAPITests_testwebview_LDFLAGS = $(webkit_tests_ldflags) 188 189 Programs_WebKit1GObjectAPITests_testhittestresult_SOURCES = Source/WebKit/gtk/tests/testhittestresult.c 190 Programs_WebKit1GObjectAPITests_testhittestresult_CFLAGS = $(webkit_tests_cflags) 191 Programs_WebKit1GObjectAPITests_testhittestresult_LDADD = $(webkit_tests_ldadd) 192 193 Programs_WebKit1GObjectAPITests_testkeyevents_SOURCES = Source/WebKit/gtk/tests/testkeyevents.c 194 Programs_WebKit1GObjectAPITests_testkeyevents_CFLAGS = $(webkit_tests_cflags) 195 Programs_WebKit1GObjectAPITests_testkeyevents_LDADD = $(webkit_tests_ldadd) 196 Programs_WebKit1GObjectAPITests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags) 197 198 Programs_WebKit1GObjectAPITests_testcopyandpaste_SOURCES = Source/WebKit/gtk/tests/testcopyandpaste.c \ 199 199 Source/WebCore/platform/gtk/GtkVersioning.c 200 Programs_ unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \200 Programs_WebKit1GObjectAPITests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \ 201 201 -I$(srcdir)/Source/WebCore/platform/gtk \ 202 202 -I$(srcdir)/Source/WebCore 203 Programs_ unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)204 Programs_ unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)203 Programs_WebKit1GObjectAPITests_testcopyandpaste_LDADD = $(webkit_tests_ldadd) 204 Programs_WebKit1GObjectAPITests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags) 205 205 206 206 EXTRA_DIST += \ -
trunk/Source/WebKit2/ChangeLog
r161176 r161182 1 2013-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 1 14 2013-12-30 Carlos Garcia Campos <cgarcia@igalia.com> 2 15 -
trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
r161138 r161182 2 2 3 3 TEST_PROGS += \ 4 Programs/WebKit2 APITests/InspectorTestServer \5 Programs/WebKit2 APITests/TestAuthentication \6 Programs/WebKit2 APITests/TestBackForwardList \7 Programs/WebKit2 APITests/TestContextMenu \8 Programs/WebKit2 APITests/TestCookieManager \9 Programs/WebKit2 APITests/TestDOMNode \10 Programs/WebKit2 APITests/TestDownloads \11 Programs/WebKit2 APITests/TestFrame \12 Programs/WebKit2 APITests/TestInspector \13 Programs/WebKit2 APITests/TestInspectorServer \14 Programs/WebKit2 APITests/TestLoaderClient \15 Programs/WebKit2 APITests/TestPrinting \16 Programs/WebKit2 APITests/TestResources \17 Programs/WebKit2 APITests/TestSSL \18 Programs/WebKit2 APITests/TestUIClient \19 Programs/WebKit2 APITests/TestWebExtensions \20 Programs/WebKit2 APITests/TestWebKitVersion \21 Programs/WebKit2 APITests/TestWebKitFaviconDatabase \22 Programs/WebKit2 APITests/TestWebKitFindController \23 Programs/WebKit2 APITests/TestWebKitPolicyClient \24 Programs/WebKit2 APITests/TestWebKitSettings \25 Programs/WebKit2 APITests/TestWebKitWebContext \26 Programs/WebKit2 APITests/TestWebKitWebView \27 Programs/WebKit2 APITests/TestWebKitWebViewGroup \28 Programs/WebKit2 APITests/TestWebViewEditor4 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 29 29 30 30 noinst_PROGRAMS += $(TEST_PROGS) 31 31 32 32 if HAVE_ATSPI2 33 TEST_PROGS += Programs/WebKit2 APITests/TestWebKitAccessibility34 35 noinst_PROGRAMS += Programs/WebKit2 APITests/AccessibilityTestServer33 TEST_PROGS += Programs/WebKit2GObjectAPITests/TestWebKitAccessibility 34 35 noinst_PROGRAMS += Programs/WebKit2GObjectAPITests/AccessibilityTestServer 36 36 endif 37 37 … … 160 160 Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js 161 161 162 Programs_WebKit2 APITests_TestWebKitWebContext_SOURCES = \162 Programs_WebKit2GObjectAPITests_TestWebKitWebContext_SOURCES = \ 163 163 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp 164 Programs_WebKit2 APITests_TestWebKitWebContext_CPPFLAGS = $(webkit2_tests_cppflags)165 Programs_WebKit2 APITests_TestWebKitWebContext_LDADD = $(webkit2_tests_ldadd)166 Programs_WebKit2 APITests_TestWebKitWebContext_LDFLAGS = $(webkit2_tests_ldflags)167 168 Programs_WebKit2 APITests_TestWebKitWebView_SOURCES = \164 Programs_WebKit2GObjectAPITests_TestWebKitWebContext_CPPFLAGS = $(webkit2_tests_cppflags) 165 Programs_WebKit2GObjectAPITests_TestWebKitWebContext_LDADD = $(webkit2_tests_ldadd) 166 Programs_WebKit2GObjectAPITests_TestWebKitWebContext_LDFLAGS = $(webkit2_tests_ldflags) 167 168 Programs_WebKit2GObjectAPITests_TestWebKitWebView_SOURCES = \ 169 169 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp 170 Programs_WebKit2 APITests_TestWebKitWebView_CPPFLAGS = $(webkit2_tests_cppflags)171 Programs_WebKit2 APITests_TestWebKitWebView_LDADD = $(webkit2_tests_ldadd)172 Programs_WebKit2 APITests_TestWebKitWebView_LDFLAGS = $(webkit2_tests_ldflags)173 174 Programs_WebKit2 APITests_TestLoaderClient_SOURCES = \170 Programs_WebKit2GObjectAPITests_TestWebKitWebView_CPPFLAGS = $(webkit2_tests_cppflags) 171 Programs_WebKit2GObjectAPITests_TestWebKitWebView_LDADD = $(webkit2_tests_ldadd) 172 Programs_WebKit2GObjectAPITests_TestWebKitWebView_LDFLAGS = $(webkit2_tests_ldflags) 173 174 Programs_WebKit2GObjectAPITests_TestLoaderClient_SOURCES = \ 175 175 Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp 176 Programs_WebKit2 APITests_TestLoaderClient_CPPFLAGS = $(webkit2_tests_cppflags)177 Programs_WebKit2 APITests_TestLoaderClient_LDADD = $(webkit2_tests_ldadd)178 Programs_WebKit2 APITests_TestLoaderClient_LDFLAGS = $(webkit2_tests_ldflags)179 180 Programs_WebKit2 APITests_TestWebKitSettings_SOURCES = \176 Programs_WebKit2GObjectAPITests_TestLoaderClient_CPPFLAGS = $(webkit2_tests_cppflags) 177 Programs_WebKit2GObjectAPITests_TestLoaderClient_LDADD = $(webkit2_tests_ldadd) 178 Programs_WebKit2GObjectAPITests_TestLoaderClient_LDFLAGS = $(webkit2_tests_ldflags) 179 180 Programs_WebKit2GObjectAPITests_TestWebKitSettings_SOURCES = \ 181 181 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 182 Programs_WebKit2 APITests_TestWebKitSettings_CPPFLAGS = $(webkit2_tests_cppflags)183 Programs_WebKit2 APITests_TestWebKitSettings_LDADD = $(webkit2_tests_ldadd)184 Programs_WebKit2 APITests_TestWebKitSettings_LDFLAGS = $(webkit2_tests_ldflags)185 186 Programs_WebKit2 APITests_InspectorTestServer_SOURCES = \182 Programs_WebKit2GObjectAPITests_TestWebKitSettings_CPPFLAGS = $(webkit2_tests_cppflags) 183 Programs_WebKit2GObjectAPITests_TestWebKitSettings_LDADD = $(webkit2_tests_ldadd) 184 Programs_WebKit2GObjectAPITests_TestWebKitSettings_LDFLAGS = $(webkit2_tests_ldflags) 185 186 Programs_WebKit2GObjectAPITests_InspectorTestServer_SOURCES = \ 187 187 Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp 188 Programs_WebKit2 APITests_InspectorTestServer_CPPFLAGS = $(webkit2_tests_cppflags)189 Programs_WebKit2 APITests_InspectorTestServer_LDADD = $(webkit2_tests_ldadd)190 Programs_WebKit2 APITests_InspectorTestServer_LDFLAGS = $(webkit2_tests_ldflags)191 192 Programs_WebKit2 APITests_TestBackForwardList_SOURCES = \188 Programs_WebKit2GObjectAPITests_InspectorTestServer_CPPFLAGS = $(webkit2_tests_cppflags) 189 Programs_WebKit2GObjectAPITests_InspectorTestServer_LDADD = $(webkit2_tests_ldadd) 190 Programs_WebKit2GObjectAPITests_InspectorTestServer_LDFLAGS = $(webkit2_tests_ldflags) 191 192 Programs_WebKit2GObjectAPITests_TestBackForwardList_SOURCES = \ 193 193 Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp 194 Programs_WebKit2 APITests_TestBackForwardList_CPPFLAGS = $(webkit2_tests_cppflags)195 Programs_WebKit2 APITests_TestBackForwardList_LDADD = $(webkit2_tests_ldadd)196 Programs_WebKit2 APITests_TestBackForwardList_LDFLAGS = $(webkit2_tests_ldflags)197 198 Programs_WebKit2 APITests_TestWebKitPolicyClient_SOURCES = \194 Programs_WebKit2GObjectAPITests_TestBackForwardList_CPPFLAGS = $(webkit2_tests_cppflags) 195 Programs_WebKit2GObjectAPITests_TestBackForwardList_LDADD = $(webkit2_tests_ldadd) 196 Programs_WebKit2GObjectAPITests_TestBackForwardList_LDFLAGS = $(webkit2_tests_ldflags) 197 198 Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_SOURCES = \ 199 199 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp 200 Programs_WebKit2 APITests_TestWebKitPolicyClient_CPPFLAGS = $(webkit2_tests_cppflags)201 Programs_WebKit2 APITests_TestWebKitPolicyClient_LDADD = $(webkit2_tests_ldadd)202 Programs_WebKit2 APITests_TestWebKitPolicyClient_LDFLAGS = $(webkit2_tests_ldflags)200 Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_CPPFLAGS = $(webkit2_tests_cppflags) 201 Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_LDADD = $(webkit2_tests_ldadd) 202 Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_LDFLAGS = $(webkit2_tests_ldflags) 203 203 204 204 if HAVE_ATSPI2 205 Programs_WebKit2 APITests_AccessibilityTestServer_SOURCES = \205 Programs_WebKit2GObjectAPITests_AccessibilityTestServer_SOURCES = \ 206 206 Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp 207 Programs_WebKit2 APITests_AccessibilityTestServer_CPPFLAGS = $(webkit2_tests_cppflags)208 Programs_WebKit2 APITests_AccessibilityTestServer_LDADD = $(webkit2_tests_ldadd)209 Programs_WebKit2 APITests_AccessibilityTestServer_LDFLAGS = $(webkit2_tests_ldflags)210 211 Programs_WebKit2 APITests_TestWebKitAccessibility_SOURCES = \207 Programs_WebKit2GObjectAPITests_AccessibilityTestServer_CPPFLAGS = $(webkit2_tests_cppflags) 208 Programs_WebKit2GObjectAPITests_AccessibilityTestServer_LDADD = $(webkit2_tests_ldadd) 209 Programs_WebKit2GObjectAPITests_AccessibilityTestServer_LDFLAGS = $(webkit2_tests_ldflags) 210 211 Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_SOURCES = \ 212 212 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp 213 Programs_WebKit2 APITests_TestWebKitAccessibility_CPPFLAGS = $(webkit2_tests_cppflags) $(ATSPI2_CFLAGS)214 Programs_WebKit2 APITests_TestWebKitAccessibility_LDADD = $(webkit2_tests_ldadd) $(ATSPI2_LIBS)215 Programs_WebKit2 APITests_TestWebKitAccessibility_LDFLAGS = $(webkit2_tests_ldflags)213 Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_CPPFLAGS = $(webkit2_tests_cppflags) $(ATSPI2_CFLAGS) 214 Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_LDADD = $(webkit2_tests_ldadd) $(ATSPI2_LIBS) 215 Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_LDFLAGS = $(webkit2_tests_ldflags) 216 216 endif 217 217 218 Programs_WebKit2 APITests_TestDownloads_SOURCES = \218 Programs_WebKit2GObjectAPITests_TestDownloads_SOURCES = \ 219 219 Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp 220 Programs_WebKit2 APITests_TestDownloads_CPPFLAGS = $(webkit2_tests_cppflags)221 Programs_WebKit2 APITests_TestDownloads_LDADD = $(webkit2_tests_ldadd)222 Programs_WebKit2 APITests_TestDownloads_LDFLAGS = $(webkit2_tests_ldflags)223 224 Programs_WebKit2 APITests_TestWebViewEditor_SOURCES = \220 Programs_WebKit2GObjectAPITests_TestDownloads_CPPFLAGS = $(webkit2_tests_cppflags) 221 Programs_WebKit2GObjectAPITests_TestDownloads_LDADD = $(webkit2_tests_ldadd) 222 Programs_WebKit2GObjectAPITests_TestDownloads_LDFLAGS = $(webkit2_tests_ldflags) 223 224 Programs_WebKit2GObjectAPITests_TestWebViewEditor_SOURCES = \ 225 225 Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp 226 Programs_WebKit2 APITests_TestWebViewEditor_CPPFLAGS = $(webkit2_tests_cppflags)227 Programs_WebKit2 APITests_TestWebViewEditor_LDADD = $(webkit2_tests_ldadd)228 Programs_WebKit2 APITests_TestWebViewEditor_LDFLAGS = $(webkit2_tests_ldflags)229 230 Programs_WebKit2 APITests_TestPrinting_SOURCES = \226 Programs_WebKit2GObjectAPITests_TestWebViewEditor_CPPFLAGS = $(webkit2_tests_cppflags) 227 Programs_WebKit2GObjectAPITests_TestWebViewEditor_LDADD = $(webkit2_tests_ldadd) 228 Programs_WebKit2GObjectAPITests_TestWebViewEditor_LDFLAGS = $(webkit2_tests_ldflags) 229 230 Programs_WebKit2GObjectAPITests_TestPrinting_SOURCES = \ 231 231 Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp 232 Programs_WebKit2 APITests_TestPrinting_CPPFLAGS = $(webkit2_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS)233 Programs_WebKit2 APITests_TestPrinting_LDADD = $(webkit2_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS)234 Programs_WebKit2 APITests_TestPrinting_LDFLAGS = $(webkit2_tests_ldflags)235 236 Programs_WebKit2 APITests_TestWebKitFaviconDatabase_SOURCES = \232 Programs_WebKit2GObjectAPITests_TestPrinting_CPPFLAGS = $(webkit2_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS) 233 Programs_WebKit2GObjectAPITests_TestPrinting_LDADD = $(webkit2_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS) 234 Programs_WebKit2GObjectAPITests_TestPrinting_LDFLAGS = $(webkit2_tests_ldflags) 235 236 Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_SOURCES = \ 237 237 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp 238 Programs_WebKit2 APITests_TestWebKitFaviconDatabase_CPPFLAGS = $(webkit2_tests_cppflags)239 Programs_WebKit2 APITests_TestWebKitFaviconDatabase_LDADD = $(webkit2_tests_ldadd)240 Programs_WebKit2 APITests_TestWebKitFaviconDatabase_LDFLAGS = $(webkit2_tests_ldflags)241 242 Programs_WebKit2 APITests_TestWebKitFindController_SOURCES = \238 Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_CPPFLAGS = $(webkit2_tests_cppflags) 239 Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_LDADD = $(webkit2_tests_ldadd) 240 Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_LDFLAGS = $(webkit2_tests_ldflags) 241 242 Programs_WebKit2GObjectAPITests_TestWebKitFindController_SOURCES = \ 243 243 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp 244 Programs_WebKit2 APITests_TestWebKitFindController_CPPFLAGS = $(webkit2_tests_cppflags)245 Programs_WebKit2 APITests_TestWebKitFindController_LDADD = $(webkit2_tests_ldadd)246 Programs_WebKit2 APITests_TestWebKitFindController_LDFLAGS = $(webkit2_tests_ldflags)247 248 Programs_WebKit2 APITests_TestResources_SOURCES = \244 Programs_WebKit2GObjectAPITests_TestWebKitFindController_CPPFLAGS = $(webkit2_tests_cppflags) 245 Programs_WebKit2GObjectAPITests_TestWebKitFindController_LDADD = $(webkit2_tests_ldadd) 246 Programs_WebKit2GObjectAPITests_TestWebKitFindController_LDFLAGS = $(webkit2_tests_ldflags) 247 248 Programs_WebKit2GObjectAPITests_TestResources_SOURCES = \ 249 249 Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp 250 Programs_WebKit2 APITests_TestResources_CPPFLAGS = $(webkit2_tests_cppflags)251 Programs_WebKit2 APITests_TestResources_LDADD = $(webkit2_tests_ldadd)252 Programs_WebKit2 APITests_TestResources_LDFLAGS = $(webkit2_tests_ldflags)253 254 Programs_WebKit2 APITests_TestCookieManager_SOURCES = \250 Programs_WebKit2GObjectAPITests_TestResources_CPPFLAGS = $(webkit2_tests_cppflags) 251 Programs_WebKit2GObjectAPITests_TestResources_LDADD = $(webkit2_tests_ldadd) 252 Programs_WebKit2GObjectAPITests_TestResources_LDFLAGS = $(webkit2_tests_ldflags) 253 254 Programs_WebKit2GObjectAPITests_TestCookieManager_SOURCES = \ 255 255 Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp 256 Programs_WebKit2 APITests_TestCookieManager_CPPFLAGS = $(webkit2_tests_cppflags)257 Programs_WebKit2 APITests_TestCookieManager_LDADD = $(webkit2_tests_ldadd)258 Programs_WebKit2 APITests_TestCookieManager_LDFLAGS = $(webkit2_tests_ldflags)259 260 Programs_WebKit2 APITests_TestInspector_SOURCES = \256 Programs_WebKit2GObjectAPITests_TestCookieManager_CPPFLAGS = $(webkit2_tests_cppflags) 257 Programs_WebKit2GObjectAPITests_TestCookieManager_LDADD = $(webkit2_tests_ldadd) 258 Programs_WebKit2GObjectAPITests_TestCookieManager_LDFLAGS = $(webkit2_tests_ldflags) 259 260 Programs_WebKit2GObjectAPITests_TestInspector_SOURCES = \ 261 261 Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp 262 Programs_WebKit2 APITests_TestInspector_CPPFLAGS = \262 Programs_WebKit2GObjectAPITests_TestInspector_CPPFLAGS = \ 263 263 $(webkit2_tests_cppflags) 264 Programs_WebKit2 APITests_TestInspector_LDADD = $(webkit2_tests_ldadd)265 Programs_WebKit2 APITests_TestInspector_LDFLAGS = $(webkit2_tests_ldflags)266 267 Programs_WebKit2 APITests_TestInspectorServer_SOURCES = \264 Programs_WebKit2GObjectAPITests_TestInspector_LDADD = $(webkit2_tests_ldadd) 265 Programs_WebKit2GObjectAPITests_TestInspector_LDFLAGS = $(webkit2_tests_ldflags) 266 267 Programs_WebKit2GObjectAPITests_TestInspectorServer_SOURCES = \ 268 268 Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp 269 Programs_WebKit2 APITests_TestInspectorServer_CPPFLAGS = $(webkit2_tests_cppflags)270 Programs_WebKit2 APITests_TestInspectorServer_LDADD = $(webkit2_tests_ldadd)271 Programs_WebKit2 APITests_TestInspectorServer_LDFLAGS = $(webkit2_tests_ldflags)272 273 Programs_WebKit2 APITests_TestWebKitVersion_SOURCES = \269 Programs_WebKit2GObjectAPITests_TestInspectorServer_CPPFLAGS = $(webkit2_tests_cppflags) 270 Programs_WebKit2GObjectAPITests_TestInspectorServer_LDADD = $(webkit2_tests_ldadd) 271 Programs_WebKit2GObjectAPITests_TestInspectorServer_LDFLAGS = $(webkit2_tests_ldflags) 272 273 Programs_WebKit2GObjectAPITests_TestWebKitVersion_SOURCES = \ 274 274 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp 275 Programs_WebKit2 APITests_TestWebKitVersion_CPPFLAGS = $(webkit2_tests_cppflags)276 Programs_WebKit2 APITests_TestWebKitVersion_LDADD = $(webkit2_tests_ldadd)277 Programs_WebKit2 APITests_TestWebKitVersion_LDFLAGS = $(webkit2_tests_ldflags)278 279 Programs_WebKit2 APITests_TestContextMenu_SOURCES = \275 Programs_WebKit2GObjectAPITests_TestWebKitVersion_CPPFLAGS = $(webkit2_tests_cppflags) 276 Programs_WebKit2GObjectAPITests_TestWebKitVersion_LDADD = $(webkit2_tests_ldadd) 277 Programs_WebKit2GObjectAPITests_TestWebKitVersion_LDFLAGS = $(webkit2_tests_ldflags) 278 279 Programs_WebKit2GObjectAPITests_TestContextMenu_SOURCES = \ 280 280 Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 281 Programs_WebKit2 APITests_TestContextMenu_CPPFLAGS = $(webkit2_tests_cppflags)282 Programs_WebKit2 APITests_TestContextMenu_LDADD = $(webkit2_tests_ldadd)283 Programs_WebKit2 APITests_TestContextMenu_LDFLAGS = $(webkit2_tests_ldflags)284 285 Programs_WebKit2 APITests_TestSSL_SOURCES = \281 Programs_WebKit2GObjectAPITests_TestContextMenu_CPPFLAGS = $(webkit2_tests_cppflags) 282 Programs_WebKit2GObjectAPITests_TestContextMenu_LDADD = $(webkit2_tests_ldadd) 283 Programs_WebKit2GObjectAPITests_TestContextMenu_LDFLAGS = $(webkit2_tests_ldflags) 284 285 Programs_WebKit2GObjectAPITests_TestSSL_SOURCES = \ 286 286 Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp 287 Programs_WebKit2 APITests_TestSSL_CPPFLAGS = $(webkit2_tests_cppflags)288 Programs_WebKit2 APITests_TestSSL_LDADD = $(webkit2_tests_ldadd)289 Programs_WebKit2 APITests_TestSSL_LDFLAGS = $(webkit2_tests_ldflags)290 291 Programs_WebKit2 APITests_TestWebExtensions_SOURCES = \287 Programs_WebKit2GObjectAPITests_TestSSL_CPPFLAGS = $(webkit2_tests_cppflags) 288 Programs_WebKit2GObjectAPITests_TestSSL_LDADD = $(webkit2_tests_ldadd) 289 Programs_WebKit2GObjectAPITests_TestSSL_LDFLAGS = $(webkit2_tests_ldflags) 290 291 Programs_WebKit2GObjectAPITests_TestWebExtensions_SOURCES = \ 292 292 Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp 293 Programs_WebKit2 APITests_TestWebExtensions_CPPFLAGS = $(webkit2_tests_cppflags)294 Programs_WebKit2 APITests_TestWebExtensions_LDADD = $(webkit2_tests_ldadd)295 Programs_WebKit2 APITests_TestWebExtensions_LDFLAGS = $(webkit2_tests_ldflags)296 297 Programs_WebKit2 APITests_TestWebKitWebViewGroup_SOURCES = \293 Programs_WebKit2GObjectAPITests_TestWebExtensions_CPPFLAGS = $(webkit2_tests_cppflags) 294 Programs_WebKit2GObjectAPITests_TestWebExtensions_LDADD = $(webkit2_tests_ldadd) 295 Programs_WebKit2GObjectAPITests_TestWebExtensions_LDFLAGS = $(webkit2_tests_ldflags) 296 297 Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_SOURCES = \ 298 298 Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp 299 Programs_WebKit2 APITests_TestWebKitWebViewGroup_CPPFLAGS = $(webkit2_tests_cppflags)300 Programs_WebKit2 APITests_TestWebKitWebViewGroup_LDADD = $(webkit2_tests_ldadd)301 Programs_WebKit2 APITests_TestWebKitWebViewGroup_LDFLAGS = $(webkit2_tests_ldflags)302 303 Programs_WebKit2 APITests_TestDOMNode_SOURCES = \299 Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_CPPFLAGS = $(webkit2_tests_cppflags) 300 Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_LDADD = $(webkit2_tests_ldadd) 301 Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_LDFLAGS = $(webkit2_tests_ldflags) 302 303 Programs_WebKit2GObjectAPITests_TestDOMNode_SOURCES = \ 304 304 Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp 305 Programs_WebKit2 APITests_TestDOMNode_CPPFLAGS = $(webkit2_tests_cppflags)306 Programs_WebKit2 APITests_TestDOMNode_LDADD = $(webkit2_tests_ldadd)307 Programs_WebKit2 APITests_TestDOMNode_LDFLAGS = $(webkit2_tests_ldflags)308 309 Programs_WebKit2 APITests_TestFrame_SOURCES = \305 Programs_WebKit2GObjectAPITests_TestDOMNode_CPPFLAGS = $(webkit2_tests_cppflags) 306 Programs_WebKit2GObjectAPITests_TestDOMNode_LDADD = $(webkit2_tests_ldadd) 307 Programs_WebKit2GObjectAPITests_TestDOMNode_LDFLAGS = $(webkit2_tests_ldflags) 308 309 Programs_WebKit2GObjectAPITests_TestFrame_SOURCES = \ 310 310 Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp 311 Programs_WebKit2 APITests_TestFrame_CPPFLAGS = $(webkit2_tests_cppflags)312 Programs_WebKit2 APITests_TestFrame_LDADD = $(webkit2_tests_ldadd)313 Programs_WebKit2 APITests_TestFrame_LDFLAGS = $(webkit2_tests_ldflags)314 315 Programs_WebKit2 APITests_TestAuthentication_SOURCES = \311 Programs_WebKit2GObjectAPITests_TestFrame_CPPFLAGS = $(webkit2_tests_cppflags) 312 Programs_WebKit2GObjectAPITests_TestFrame_LDADD = $(webkit2_tests_ldadd) 313 Programs_WebKit2GObjectAPITests_TestFrame_LDFLAGS = $(webkit2_tests_ldflags) 314 315 Programs_WebKit2GObjectAPITests_TestAuthentication_SOURCES = \ 316 316 Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp 317 Programs_WebKit2 APITests_TestAuthentication_CPPFLAGS = $(webkit2_tests_cppflags)318 Programs_WebKit2 APITests_TestAuthentication_LDADD = $(webkit2_tests_ldadd)319 Programs_WebKit2 APITests_TestAuthentication_LDFLAGS = $(webkit2_tests_ldflags)320 321 Programs_WebKit2 APITests_TestUIClient_SOURCES = \317 Programs_WebKit2GObjectAPITests_TestAuthentication_CPPFLAGS = $(webkit2_tests_cppflags) 318 Programs_WebKit2GObjectAPITests_TestAuthentication_LDADD = $(webkit2_tests_ldadd) 319 Programs_WebKit2GObjectAPITests_TestAuthentication_LDFLAGS = $(webkit2_tests_ldflags) 320 321 Programs_WebKit2GObjectAPITests_TestUIClient_SOURCES = \ 322 322 Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp 323 Programs_WebKit2 APITests_TestUIClient_CPPFLAGS = $(webkit2_tests_cppflags)324 Programs_WebKit2 APITests_TestUIClient_LDADD = $(webkit2_tests_ldadd)325 Programs_WebKit2 APITests_TestUIClient_LDFLAGS = $(webkit2_tests_ldflags)323 Programs_WebKit2GObjectAPITests_TestUIClient_CPPFLAGS = $(webkit2_tests_cppflags) 324 Programs_WebKit2GObjectAPITests_TestUIClient_LDADD = $(webkit2_tests_ldadd) 325 Programs_WebKit2GObjectAPITests_TestUIClient_LDFLAGS = $(webkit2_tests_ldflags) 326 326 327 327 endif # ENABLE_WEBKIT2 -
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp
r155985 r161182 80 80 { 81 81 // Prepare argv[] for spawning the server process. 82 GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2 APITests", gTestServerAppName, NULL));82 GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", gTestServerAppName, NULL)); 83 83 84 84 // We install a handler to ensure that we kill the child process -
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp
r160270 r161182 88 88 { 89 89 // Prepare argv[] for spawning the server process. 90 GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2 APITests", kTestServerAppName, NULL));90 GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", kTestServerAppName, NULL)); 91 91 92 92 char* testServerArgv[2]; -
trunk/Tools/ChangeLog
r161171 r161182 1 2013-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 1 12 2013-12-30 Alexey Proskuryakov <ap@apple.com> 2 13 -
trunk/Tools/Scripts/run-gtk-tests
r161138 r161182 59 59 60 60 class TestRunner: 61 TEST_DIRS = [ " unittests", "WebKit2APITests", "TestWebKitAPI" ]61 TEST_DIRS = [ "WebKit1GObjectAPITests", "WebKit2GObjectAPITests", "TestWebKitAPI" ] 62 62 63 63 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("WebKit2 APITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),70 SkippedTest("WebKit2 APITests/TestUIClient", "/webkit2/WebKitWebView/mouse-target", "Test times out after r150890", 117689),71 SkippedTest("WebKit2 APITests/TestAuthentication", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),72 SkippedTest("WebKit2 APITests/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), 73 73 SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066), 74 74 SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066), … … 87 87 SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068), 88 88 SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068), 89 SkippedTest("WebKit2 APITests/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),89 SkippedTest("WebKit2GObjectAPITests/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571), 90 90 ] 91 91 … … 360 360 361 361 def _run_test(self, test_program): 362 if " unittests" in test_program or "WebKit2APITests" in test_program:362 if "GObjectAPITest" in test_program: 363 363 return self._run_test_glib(test_program) 364 364
Note: See TracChangeset
for help on using the changeset viewer.