Title: [229325] trunk/Tools
- Revision
- 229325
- Author
- zandober...@gmail.com
- Date
- 2018-03-06 09:38:05 -0800 (Tue, 06 Mar 2018)
Log Message
REGRESSION(r229309): s_exceptionInstructions allocation change causing crashes in LLInt on WPE
https://bugs.webkit.org/show_bug.cgi?id=183366
Reviewed by Michael Catanzaro.
Have the TestRunnerInjectedBundle CMake library link against libraries
in the WebKitTestRunnerInjectedBundle_LIBRARIES list, and not the
WebKitTestRunner_LIBRARIES list, which is used for the WebKitTestRunner
executable. This allows narrowing down the libraries to only those that
are necessary for the injected bundle shared object.
The GTK+ port already has this list specified, adding one for the WPE
port.
* WebKitTestRunner/CMakeLists.txt:
Link the TestRunnerInjectedBundle library against the libraries in the
WebKitTestRunnerInjectedBundle_LIBRARIES list.
* WebKitTestRunner/PlatformWPE.cmake:
Specify the WebKitTestRunnerInjectedBundle_LIBRARIES list, including the
basic system dependencies, WebCoreTestSupport and WebKit. This follows
the GTK+ port.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (229324 => 229325)
--- trunk/Tools/ChangeLog 2018-03-06 17:38:03 UTC (rev 229324)
+++ trunk/Tools/ChangeLog 2018-03-06 17:38:05 UTC (rev 229325)
@@ -1,3 +1,27 @@
+2018-03-06 Zan Dobersek <zdober...@igalia.com>
+
+ REGRESSION(r229309): s_exceptionInstructions allocation change causing crashes in LLInt on WPE
+ https://bugs.webkit.org/show_bug.cgi?id=183366
+
+ Reviewed by Michael Catanzaro.
+
+ Have the TestRunnerInjectedBundle CMake library link against libraries
+ in the WebKitTestRunnerInjectedBundle_LIBRARIES list, and not the
+ WebKitTestRunner_LIBRARIES list, which is used for the WebKitTestRunner
+ executable. This allows narrowing down the libraries to only those that
+ are necessary for the injected bundle shared object.
+
+ The GTK+ port already has this list specified, adding one for the WPE
+ port.
+
+ * WebKitTestRunner/CMakeLists.txt:
+ Link the TestRunnerInjectedBundle library against the libraries in the
+ WebKitTestRunnerInjectedBundle_LIBRARIES list.
+ * WebKitTestRunner/PlatformWPE.cmake:
+ Specify the WebKitTestRunnerInjectedBundle_LIBRARIES list, including the
+ basic system dependencies, WebCoreTestSupport and WebKit. This follows
+ the GTK+ port.
+
2018-03-06 Dominik Infuehr <dinfu...@igalia.com>
[ARM] Disable tests that run out of memory
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (229324 => 229325)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2018-03-06 17:38:03 UTC (rev 229324)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2018-03-06 17:38:05 UTC (rev 229325)
@@ -109,7 +109,7 @@
include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES})
add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES})
-target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES})
+target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunnerInjectedBundle_LIBRARIES})
add_dependencies(TestRunnerInjectedBundle WebKitTestRunnerInjectedBundleBindings)
add_executable(WebKitTestRunner ${WebKitTestRunner_SOURCES})
Modified: trunk/Tools/WebKitTestRunner/PlatformWPE.cmake (229324 => 229325)
--- trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2018-03-06 17:38:03 UTC (rev 229324)
+++ trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2018-03-06 17:38:05 UTC (rev 229325)
@@ -34,6 +34,13 @@
WPEHeadlessViewBackend
)
+set(WebKitTestRunnerInjectedBundle_LIBRARIES
+ ${CAIRO_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ WebCoreTestSupport
+ WebKit
+)
+
list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/wpe/AccessibilityControllerWPE.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/wpe/AccessibilityUIElementWPE.cpp
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
