Diff
Modified: trunk/ChangeLog (161014 => 161015)
--- trunk/ChangeLog 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/ChangeLog 2013-12-23 21:48:46 UTC (rev 161015)
@@ -1,3 +1,12 @@
+2013-12-23 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Build the WebKit1 GObject API tests
+ https://bugs.webkit.org/show_bug.cgi?id=125684
+
+ Reviewed by Daniel Bates.
+
+ * Source/PlatformGTK.cmake: Added.
+
2013-12-22 Martin Robinson <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=125511
Added: trunk/Source/PlatformGTK.cmake (0 => 161015)
--- trunk/Source/PlatformGTK.cmake (rev 0)
+++ trunk/Source/PlatformGTK.cmake 2013-12-23 21:48:46 UTC (rev 161015)
@@ -0,0 +1,3 @@
+if (ENABLE_WEBKIT)
+ add_subdirectory(${WEBKIT_DIR}/gtk/tests)
+endif ()
Modified: trunk/Source/WebKit/gtk/ChangeLog (161014 => 161015)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-12-23 21:48:46 UTC (rev 161015)
@@ -1,3 +1,40 @@
+2013-12-23 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Build the WebKit1 GObject API tests
+ https://bugs.webkit.org/show_bug.cgi?id=125684
+
+ Reviewed by Daniel Bates.
+
+ * tests/CMakeLists.txt: Added.
+ * tests/testapplicationcache.c: Use the WTF config.h instead of including the autotools configuration directly.
+ * tests/testatk.c: Ditto.
+ * tests/testatkroles.c: Ditto.
+ * tests/testcontextmenu.c: Ditto.
+ * tests/testcopyandpaste.c: Ditto.
+ * tests/testdomdocument.c: Ditto.
+ * tests/testdomdomwindow.c: Ditto.
+ * tests/testdomnode.c: Ditto.
+ * tests/testdownload.c: Ditto.
+ * tests/testfavicondatabase.c: Ditto.
+ * tests/testglobals.c: Ditto.
+ * tests/testhittestresult.c: Ditto.
+ * tests/testhttpbackend.c: Ditto.
+ * tests/testkeyevents.c: Ditto.
+ * tests/testloading.c: Ditto.
+ * tests/testmimehandling.c: Ditto.
+ * tests/testnetworkrequest.c: Ditto.
+ * tests/testnetworkresponse.c: Ditto.
+ * tests/testwebbackforwardlist.c: Ditto.
+ * tests/testwebdatasource.c: Ditto.
+ * tests/testwebframe.c: Ditto.
+ * tests/testwebhistoryitem.c: Ditto.
+ * tests/testwebinspector.c: Ditto.
+ * tests/testwebplugindatabase.c: Ditto.
+ * tests/testwebresource.c: Ditto.
+ * tests/testwebsettings.c: Ditto.
+ * tests/testwebview.c: Ditto.
+ * tests/testwindow.c: Ditto.
+
2013-12-20 Enrique Ocaña González <[email protected]>
[GTK] The fullscreen API should be enabled by default
Added: trunk/Source/WebKit/gtk/tests/CMakeLists.txt (0 => 161015)
--- trunk/Source/WebKit/gtk/tests/CMakeLists.txt (rev 0)
+++ trunk/Source/WebKit/gtk/tests/CMakeLists.txt 2013-12-23 21:48:46 UTC (rev 161015)
@@ -0,0 +1,60 @@
+set(TEST_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
+
+add_definitions(-DTEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/Source
+ ${CMAKE_SOURCE_DIR}/Source/_javascript_Core/ForwardingHeaders
+ ${CMAKE_SOURCE_DIR}/Source/WebKit/gtk
+ ${CMAKE_SOURCE_DIR}/Source/WebCore/platform/gtk
+ ${CMAKE_SOURCE_DIR}/Source/WebCore/platform
+ ${CMAKE_SOURCE_DIR}/Source/WTF
+ ${DERIVED_SOURCES_DIR}
+ ${DERIVED_SOURCES_DIR}/webkit
+ ${GLIB_INCLUDE_DIRS}
+ ${GTK3_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
+)
+
+macro(ADD_WK1_TEST test_name)
+ add_executable(${test_name} ${ARGN})
+ target_link_libraries(${test_name}
+ _javascript_Core
+ WebKit
+ ${GLIB_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
+ )
+ set_target_properties(${test_name} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${TEST_BINARY_DIR}/WebKit1GObjectAPITests
+ )
+endmacro()
+
+ADD_WK1_TEST(testapplicationcache testapplicationcache.c)
+ADD_WK1_TEST(testatkroles testatkroles.c)
+ADD_WK1_TEST(testatk testatk.c)
+ADD_WK1_TEST(testcontextmenu testcontextmenu.c)
+ADD_WK1_TEST(testcopyandpaste testcopyandpaste.c ${WEBCORE_DIR}/platform/gtk/GtkVersioning.c)
+ADD_WK1_TEST(testdomdocument testdomdocument.c)
+ADD_WK1_TEST(testdomdomwindow testdomdomwindow.c)
+ADD_WK1_TEST(testdomnode testdomnode.c)
+ADD_WK1_TEST(testdownload testdownload.c)
+ADD_WK1_TEST(testfavicondatabase testfavicondatabase.c test_utils.c)
+ADD_WK1_TEST(testglobals testglobals.c)
+ADD_WK1_TEST(testhittestresult testhittestresult.c)
+ADD_WK1_TEST(testhttpbackend testhttpbackend.c)
+ADD_WK1_TEST(testkeyevents testkeyevents.c)
+ADD_WK1_TEST(testloading testloading.c)
+ADD_WK1_TEST(testmimehandling testmimehandling.c test_utils.c)
+ADD_WK1_TEST(testnetworkrequest testnetworkrequest.c)
+ADD_WK1_TEST(testnetworkresponse testnetworkresponse.c)
+ADD_WK1_TEST(testwebbackforwardlist testwebbackforwardlist.c)
+ADD_WK1_TEST(testwebdatasource testwebdatasource.c)
+ADD_WK1_TEST(testwebframe testwebframe.c)
+ADD_WK1_TEST(testwebhistoryitem testwebhistoryitem.c)
+ADD_WK1_TEST(testwebinspector testwebinspector.c test_utils.c)
+ADD_WK1_TEST(testwebplugindatabase testwebplugindatabase.c)
+ADD_WK1_TEST(testwebresource testwebresource.c)
+ADD_WK1_TEST(testwebsettings testwebsettings.c)
+ADD_WK1_TEST(testwebview testwebview.c test_utils.c)
+ADD_WK1_TEST(testwindow testwindow.c)
Property changes on: trunk/Source/WebKit/gtk/tests/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebKit/gtk/tests/testapplicationcache.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testapplicationcache.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testapplicationcache.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <glib.h>
#include <glib/gprintf.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebKit/gtk/tests/testatk.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testatk.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testatk.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testatkroles.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testatkroles.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testatkroles.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <glib.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebKit/gtk/tests/testcontextmenu.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testcontextmenu.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testcontextmenu.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <webkit/webkit.h>
typedef struct {
Modified: trunk/Source/WebKit/gtk/tests/testcopyandpaste.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testcopyandpaste.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testcopyandpaste.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testdomdocument.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testdomdocument.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testdomdocument.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testdomdomwindow.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testdomdomwindow.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testdomdomwindow.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testdomnode.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testdomnode.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testdomnode.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testdownload.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testdownload.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testdownload.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testfavicondatabase.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testfavicondatabase.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testfavicondatabase.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include "test_utils.h"
#include <glib/gstdio.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebKit/gtk/tests/testglobals.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testglobals.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testglobals.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <gtk/gtk.h>
#include <libsoup/soup.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testhittestresult.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testhittestresult.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testhittestresult.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testhttpbackend.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testhttpbackend.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testhttpbackend.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testkeyevents.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testkeyevents.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testkeyevents.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testloading.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testloading.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testloading.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <gtk/gtk.h>
#include <libsoup/soup.h>
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testmimehandling.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testmimehandling.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testmimehandling.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include "test_utils.h"
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testnetworkrequest.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testnetworkrequest.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testnetworkrequest.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testnetworkresponse.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testnetworkresponse.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testnetworkresponse.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebdatasource.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebdatasource.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebdatasource.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebframe.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebframe.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebframe.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <unistd.h>
#include <glib.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebinspector.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebinspector.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebinspector.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include "test_utils.h"
#include <string.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebresource.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebresource.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebresource.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <libsoup/soup.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebsettings.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebsettings.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebsettings.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
Modified: trunk/Source/WebKit/gtk/tests/testwebview.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwebview.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwebview.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include "test_utils.h"
#include <errno.h>
Modified: trunk/Source/WebKit/gtk/tests/testwindow.c (161014 => 161015)
--- trunk/Source/WebKit/gtk/tests/testwindow.c 2013-12-23 21:39:23 UTC (rev 161014)
+++ trunk/Source/WebKit/gtk/tests/testwindow.c 2013-12-23 21:48:46 UTC (rev 161015)
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "autotoolsconfig.h"
+#include "config.h"
#include <gtk/gtk.h>
#include <webkit/webkit.h>
