Changeset 174093 in webkit
- Timestamp:
- Sep 29, 2014 7:02:15 PM (9 years ago)
- Location:
- trunk/Tools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r174092 r174093 1 2014-09-29 Carlos Alberto Lopez Perez <clopez@igalia.com> 2 3 [GTK] [EFL] Install TestNetscapePlugin apart from the other libs. 4 https://bugs.webkit.org/show_bug.cgi?id=137212 5 6 This moves TestNetscapePlugin to a new folder (lib/plugins). 7 We should not use the same directory for TestNetscapePlugin and 8 the other libraries, because we end up scanning all the .so in the 9 lib dir for every test. 10 11 Reviewed by Carlos Garcia Campos. 12 13 * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Set LIBRARY_OUTPUT_DIRECTORY to lib/plugins. 14 * Scripts/webkitpy/port/efl.py: 15 (EflPort.setup_environ_for_server): Update plugin path. 16 * Scripts/webkitpy/port/gtk.py: 17 (GtkPort.setup_environ_for_server): Update plugin path. 18 * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Update plugin path. 19 1 20 2014-09-29 Alexey Proskuryakov <ap@apple.com> 2 21 -
trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
r166842 r174093 45 45 add_library(TestNetscapePlugin SHARED ${WebKitTestNetscapePlugin_SOURCES}) 46 46 target_link_libraries(TestNetscapePlugin ${WebKitTestNetscapePlugin_LIBRARIES}) 47 set_target_properties(TestNetscapePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins) -
trunk/Tools/Scripts/webkitpy/port/efl.py
r173689 r174093 66 66 67 67 env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so') 68 env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib' )68 env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib', 'plugins') 69 69 70 70 # Silence GIO warnings about using the "memory" GSettings backend. -
trunk/Tools/Scripts/webkitpy/port/gtk.py
r173689 r174093 111 111 environment['LIBOVERLAY_SCROLLBAR'] = '0' 112 112 environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so') 113 environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib' )113 environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib', 'plugins') 114 114 self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR') 115 115 if self._driver_class() == XvfbDriver and self._should_use_jhbuild(): -
trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
r171742 r174093 5 5 6 6 add_definitions( 7 -DWEBKIT_TEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY} "7 -DWEBKIT_TEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins" 8 8 -DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" 9 9 -DWEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}"
Note: See TracChangeset
for help on using the changeset viewer.