[GTK] Enable seccomp filter API tests

https://bugs.webkit.org/show_bug.cgi?id=140071

Reviewed by Žan Doberšek.

These tests will now be run by the run-gtk-tests script.

* TestWebKitAPI/PlatformGTK.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 673f8d1..eccaa90 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,16 @@
 2015-07-19  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        [GTK] Enable seccomp filter API tests
+        https://bugs.webkit.org/show_bug.cgi?id=140071
+
+        Reviewed by Žan Doberšek.
+
+        These tests will now be run by the run-gtk-tests script.
+
+        * TestWebKitAPI/PlatformGTK.cmake:
+
+2015-07-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         [GTK] Add seccomp filters support
         https://bugs.webkit.org/show_bug.cgi?id=110014
 

diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
index 747379b..1fc4a73 100644 (file)
--- a/Tools/TestWebKitAPI/PlatformGTK.cmake
+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
@@ -118,6 +118,20 @@ add_test(TestWebKit2 ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/TestWebKi
 set_tests_properties(TestWebKit2 PROPERTIES TIMEOUT 60)
 set_target_properties(TestWebKit2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)
 
+if (ENABLE_SECCOMP_FILTERS)
+    # This test needs to be in its own executable. It's a general test of the
+    # seccomp filter mechanism, and the filters it sets are incompatible with
+    # the correct operation of WebKit and the other tests.
+    add_executable(TestSeccompFilters
+        ${TESTWEBKITAPI_DIR}/Tests/WebKit2/SeccompFilters.cpp
+    )
+
+    target_link_libraries(TestSeccompFilters ${test_webkit2_api_LIBRARIES})
+    add_test(TestSeccompFilters ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/TestWebKit2)
+    set_tests_properties(TestSeccompFilters PROPERTIES TIMEOUT 5)
+    set_target_properties(TestSeccompFilters PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)
+endif ()
+
 set(TestWebCoreGtk_SOURCES
     ${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/UserAgentQuirks.cpp
 )