Title: [144970] trunk/Source/WebKit/chromium
- Revision
- 144970
- Author
- [email protected]
- Date
- 2013-03-06 13:12:04 -0800 (Wed, 06 Mar 2013)
Log Message
[chromium] Express webkit_unit_tests' dependency on DumpRenderTree.pak in gyp
https://bugs.webkit.org/show_bug.cgi?id=111508
Patch by James Robinson <[email protected]> on 2013-03-06
Reviewed by Dirk Pranke.
Some tests in webkit_unit_tests, for example WebPageSerializerTest.HTMLNodes, depend on localizable resources
from a pak file. Since unit tests initialize for testing with the same webkit_support functions as layout tests
they end up using DumpRenderTree.pak, but this dependency isn't listed explicitly in the gyp so if you manage to
run webkit_unit_tests without building DumpRenderTree first these tests just crash.
This adds a dependency from webkit_unit_tests to DumpRenderTree_resources so the pak is always built. It's a bit
weird for a gyp file in Source/WebKit/chromium/ to reach into Tools/DumpRenderTree, but I can't think of
anything better.
* WebKitUnitTests.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (144969 => 144970)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-06 21:09:34 UTC (rev 144969)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-06 21:12:04 UTC (rev 144970)
@@ -1,3 +1,21 @@
+2013-03-06 James Robinson <[email protected]>
+
+ [chromium] Express webkit_unit_tests' dependency on DumpRenderTree.pak in gyp
+ https://bugs.webkit.org/show_bug.cgi?id=111508
+
+ Reviewed by Dirk Pranke.
+
+ Some tests in webkit_unit_tests, for example WebPageSerializerTest.HTMLNodes, depend on localizable resources
+ from a pak file. Since unit tests initialize for testing with the same webkit_support functions as layout tests
+ they end up using DumpRenderTree.pak, but this dependency isn't listed explicitly in the gyp so if you manage to
+ run webkit_unit_tests without building DumpRenderTree first these tests just crash.
+
+ This adds a dependency from webkit_unit_tests to DumpRenderTree_resources so the pak is always built. It's a bit
+ weird for a gyp file in Source/WebKit/chromium/ to reach into Tools/DumpRenderTree, but I can't think of
+ anything better.
+
+ * WebKitUnitTests.gyp:
+
2013-03-06 Jochen Eisinger <[email protected]>
[chromium] introduce WebUserGestureIndicator
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (144969 => 144970)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-03-06 21:09:34 UTC (rev 144969)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-03-06 21:12:04 UTC (rev 144970)
@@ -55,14 +55,15 @@
'msvs_guid': '7CEFE800-8403-418A-AD6A-2D52C6FC3EAD',
'dependencies': [
'WebKit.gyp:webkit',
- '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
- '<(chromium_src_dir)/testing/gtest.gyp:gtest',
- '<(chromium_src_dir)/testing/gmock.gyp:gmock',
+ '../../../Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree_resources',
'<(chromium_src_dir)/base/base.gyp:base',
'<(chromium_src_dir)/base/base.gyp:base_i18n',
'<(chromium_src_dir)/base/base.gyp:test_support_base',
+ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
+ '<(chromium_src_dir)/testing/gmock.gyp:gmock',
+ '<(chromium_src_dir)/testing/gtest.gyp:gtest',
'<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
+ '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
],
'sources': [
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
