Title: [174421] releases/WebKitGTK/webkit-2.6/Tools
- Revision
- 174421
- Author
- [email protected]
- Date
- 2014-10-08 00:30:16 -0700 (Wed, 08 Oct 2014)
Log Message
Merge r174093 - [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: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (174420 => 174421)
--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-08 07:30:16 UTC (rev 174421)
@@ -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-10-07 Carlos Garcia Campos <[email protected]>
[SOUP] TLS errors should take precedence over HTTP authentication
Modified: releases/WebKitGTK/webkit-2.6/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (174420 => 174421)
--- releases/WebKitGTK/webkit-2.6/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2014-10-08 07:30:16 UTC (rev 174421)
@@ -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: releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/efl.py (174420 => 174421)
--- releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/efl.py 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/efl.py 2014-10-08 07:30:16 UTC (rev 174421)
@@ -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: releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/gtk.py (174420 => 174421)
--- releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/gtk.py 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/gtk.py 2014-10-08 07:30:16 UTC (rev 174421)
@@ -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: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt (174420 => 174421)
--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-10-08 07:30:16 UTC (rev 174421)
@@ -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
