Title: [174093] trunk/Tools
- Revision
- 174093
- Author
- [email protected]
- Date
- 2014-09-29 19:02:15 -0700 (Mon, 29 Sep 2014)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (174092 => 174093)
--- trunk/Tools/ChangeLog 2014-09-29 23:08:07 UTC (rev 174092)
+++ trunk/Tools/ChangeLog 2014-09-30 02:02:15 UTC (rev 174093)
@@ -1,3 +1,22 @@
+2014-09-29 Carlos Alberto Lopez Perez <[email protected]>
+
+ [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 <[email protected]>
A small change to EWS bubble text. Explain why there are messages for ineligible patches.
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (174092 => 174093)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2014-09-29 23:08:07 UTC (rev 174092)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2014-09-30 02:02:15 UTC (rev 174093)
@@ -44,3 +44,4 @@
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)
Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (174092 => 174093)
--- trunk/Tools/Scripts/webkitpy/port/efl.py 2014-09-29 23:08:07 UTC (rev 174092)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2014-09-30 02:02:15 UTC (rev 174093)
@@ -65,7 +65,7 @@
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'
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (174092 => 174093)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-09-29 23:08:07 UTC (rev 174092)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-09-30 02:02:15 UTC (rev 174093)
@@ -110,7 +110,7 @@
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'],
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt (174092 => 174093)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-09-29 23:08:07 UTC (rev 174092)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-09-30 02:02:15 UTC (rev 174093)
@@ -4,7 +4,7 @@
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}"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
