[GTK] [EFL] Install TestNetscapePlugin apart from the other libs.
authorclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Sep 2014 02:02:15 +0000 (02:02 +0000)
committerclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Sep 2014 02:02:15 +0000 (02:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=137212

This moves TestNetscapePlugin to a new folder (lib/plugins).
We should not use the same directory for TestNetscapePlugin and
the other libraries, because we end up scanning all the .so in the
lib dir for every test.

Reviewed by Carlos Garcia Campos.

* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Set LIBRARY_OUTPUT_DIRECTORY to lib/plugins.
* Scripts/webkitpy/port/efl.py:
(EflPort.setup_environ_for_server): Update plugin path.
* Scripts/webkitpy/port/gtk.py:
(GtkPort.setup_environ_for_server): Update plugin path.
* TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Update plugin path.

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

Tools/ChangeLog
Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
Tools/Scripts/webkitpy/port/efl.py
Tools/Scripts/webkitpy/port/gtk.py
Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt

index 6485a89..e767291 100644 (file)
@@ -1,3 +1,22 @@
+2014-09-29  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK] [EFL] Install TestNetscapePlugin apart from the other libs.
+        https://bugs.webkit.org/show_bug.cgi?id=137212
+
+        This moves TestNetscapePlugin to a new folder (lib/plugins).
+        We should not use the same directory for TestNetscapePlugin and
+        the other libraries, because we end up scanning all the .so in the
+        lib dir for every test.
+
+        Reviewed by Carlos Garcia Campos.
+
+        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Set LIBRARY_OUTPUT_DIRECTORY to lib/plugins.
+        * Scripts/webkitpy/port/efl.py:
+        (EflPort.setup_environ_for_server): Update plugin path.
+        * Scripts/webkitpy/port/gtk.py:
+        (GtkPort.setup_environ_for_server): Update plugin path.
+        * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Update plugin path.
+
 2014-09-29  Alexey Proskuryakov  <ap@apple.com>
 
         A small change to EWS bubble text. Explain why there are messages for ineligible patches.
index c29f4c1..78302df 100644 (file)
@@ -44,3 +44,4 @@ set(WebKitTestNetscapePlugin_LIBRARIES
 
 add_library(TestNetscapePlugin SHARED ${WebKitTestNetscapePlugin_SOURCES})
 target_link_libraries(TestNetscapePlugin ${WebKitTestNetscapePlugin_LIBRARIES})
+set_target_properties(TestNetscapePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
index 53af15f..c453d32 100644 (file)
@@ -65,7 +65,7 @@ class EflPort(Port):
             del env['DISPLAY']
 
         env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
-        env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib')
+        env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
 
         # Silence GIO warnings about using the "memory" GSettings backend.
         env['GSETTINGS_BACKEND'] = 'memory'
index aebcb53..8e1693a 100644 (file)
@@ -110,7 +110,7 @@ class GtkPort(Port):
         environment['GSETTINGS_BACKEND'] = 'memory'
         environment['LIBOVERLAY_SCROLLBAR'] = '0'
         environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
-        environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib')
+        environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
         if self._driver_class() == XvfbDriver and self._should_use_jhbuild():
             llvmpipe_libgl_path = self.host.executive.run_command(self._jhbuild_wrapper + ['printenv', 'LLVMPIPE_LIBGL_PATH'],
index 265bc2d..1a2f9d2 100644 (file)
@@ -4,7 +4,7 @@ set(TEST_RESOURCES_DIR ${TEST_BINARY_DIR}/resources)
 file(MAKE_DIRECTORY ${TEST_RESOURCES_DIR})
 
 add_definitions(
-    -DWEBKIT_TEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+    -DWEBKIT_TEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins"
     -DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
     -DWEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}"
     -DWEBKIT_TEST_WEB_EXTENSIONS_DIR="${TEST_LIBRARY_DIR}"