Changeset 168834 in webkit

Timestamp:

May 14, 2014 5:48:45 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(CMAKE): [GTK] InputMethodFilter unit test is not built
​https://bugs.webkit.org/show_bug.cgi?id=132686

Reviewed by Philippe Normand.

Bring back InputMethodFilter test to the build and compile it into
a single binary TestWebCore with the other WebCore tests. Also
move it from TestWebKitAPI/gtk/ to TestWebKitAPI/Tests/WebCore/gtk/.

• Scripts/run-gtk-tests:

(TestRunner): Remove WebCoreGtk from the list of test directories.

• TestWebKitAPI/PlatformGTK.cmake:
• TestWebKitAPI/Tests/WebCore/gtk/InputMethodFilter.cpp: Renamed from Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-gtk-tests (modified) (1 diff)
• TestWebKitAPI/PlatformGTK.cmake (modified) (1 diff)
• TestWebKitAPI/Tests/WebCore/gtk (added)
• TestWebKitAPI/Tests/WebCore/gtk/InputMethodFilter.cpp (copied) (copied from trunk/Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp) (3 diffs)
• TestWebKitAPI/Tests/gtk (deleted)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-05-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(CMAKE): [GTK] InputMethodFilter unit test is not built
+        https://bugs.webkit.org/show_bug.cgi?id=132686
+
+        Reviewed by Philippe Normand.
+
+        Bring back InputMethodFilter test to the build and compile it into
+        a single binary TestWebCore with the other WebCore tests. Also
+        move it from TestWebKitAPI/gtk/ to TestWebKitAPI/Tests/WebCore/gtk/.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner): Remove WebCoreGtk from the list of test directories.
+        * TestWebKitAPI/PlatformGTK.cmake:
+        * TestWebKitAPI/Tests/WebCore/gtk/InputMethodFilter.cpp: Renamed from Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp.
+
 2014-05-14  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -59 +59 @@
 
 class TestRunner:
-    TEST_DIRS = [ "WebKit2Gtk", "WebKit2", "JavaScriptCore", "WTF", "WebCore",  "WebCoreGtk" ]
+    TEST_DIRS = [ "WebKit2Gtk", "WebKit2", "JavaScriptCore", "WTF", "WebCore" ]
 
     SKIPPED = [

trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

@@ -112 +112 @@
 set_target_properties(TestWebKit2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)
 
-# The list below works like a test expectation. Tests in the
-# test_{webkit2_api|webcore}_BINARIES list are added to the test runner and
-# tried on the bots on every build. Tests in test_{webkit2_api|webcore}_BINARIES
-# are compiled and suffixed with fail and skipped from the test runner.
-#
-# Make sure that the tests are passing on both Debug and
-# Release builds before adding it to test_{webkit2_api|webcore}_BINARIES.
-
-set(test_webcore_BINARIES
-    LayoutUnit
-    URL
+set(TestWebCoreGtk_SOURCES
+    ${WEBCORE_DIR}/platform/graphics/IntPoint.cpp
+    ${WEBCORE_DIR}/platform/graphics/IntRect.cpp
+    ${WEBCORE_DIR}/platform/graphics/IntSize.cpp
+    ${WEBCORE_DIR}/platform/graphics/cairo/IntRectCairo.cpp
+    ${WEBCORE_DIR}/platform/graphics/gtk/IntRectGtk.cpp
+    ${WEBCORE_DIR}/platform/gtk/GtkInputMethodFilter.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/InputMethodFilter.cpp
 )
 
+add_executable(TestWebCore
+    ${test_main_SOURCES}
+    ${TestWebCoreGtk_SOURCES}
+    ${TESTWEBKITAPI_DIR}/TestsController.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WebCore/URL.cpp
+)
+
+target_link_libraries(TestWebCore ${test_webcore_LIBRARIES})
+add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)
+set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
+set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)

trunk/Tools/TestWebKitAPI/Tests/WebCore/gtk/InputMethodFilter.cpp

@@ -26 +26 @@
 #include "config.h"
 
-#include "GtkInputMethodFilter.h"
 #include "WTFStringUtilities.h"
+#include <WebCore/GtkInputMethodFilter.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -52 +52 @@
     Vector<String>& events() { return m_events; }
 
-    void sendKeyEventToFilter(unsigned int gdkKeyValue, GdkEventType type, unsigned int modifiers = 0)
+    void sendKeyEventToFilter(unsigned gdkKeyValue, GdkEventType type, unsigned modifiers = 0)
     {
         GdkEvent* event = gdk_event_new(type);
@@ -74 +74 @@
     }
 
-    void sendPressAndReleaseKeyEventPairToFilter(unsigned int gdkKeyValue, unsigned int modifiers = 0)
+    void sendPressAndReleaseKeyEventPairToFilter(unsigned gdkKeyValue, unsigned modifiers = 0)
     {
         sendKeyEventToFilter(gdkKeyValue, GDK_KEY_PRESS, modifiers);