Modified: trunk/Tools/ChangeLog (118084 => 118085)
--- trunk/Tools/ChangeLog 2012-05-23 00:09:01 UTC (rev 118084)
+++ trunk/Tools/ChangeLog 2012-05-23 00:21:07 UTC (rev 118085)
@@ -1,3 +1,13 @@
+2012-05-22 Xianzhu Wang <wangxian...@chromium.org>
+
+ [Chromium] Move conditions in DumpRenderTree.gypi into DumpRenderTree.gyp
+ https://bugs.webkit.org/show_bug.cgi?id=87176
+
+ Reviewed by Tony Chang.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * DumpRenderTree/DumpRenderTree.gypi:
+
2012-05-22 Jochen Eisinger <joc...@chromium.org>
[chromium] add --driver-name option to run_webkit_tests.py to allow for selecting alternative DRT binaries
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (118084 => 118085)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-05-23 00:09:01 UTC (rev 118084)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-05-23 00:21:07 UTC (rev 118085)
@@ -104,6 +104,13 @@
'<@(drt_files)',
],
'conditions': [
+ ['OS=="mac" or OS=="win" or toolkit_uses_gtk==1', {
+ # These platforms have their own implementations of
+ # checkLayoutTestSystemDependencies() and openStartupDialog().
+ 'sources/': [
+ ['exclude', 'TestShellStub\\.cpp$'],
+ ],
+ }],
['OS=="win"', {
'dependencies': [
'LayoutTestHelper',
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gypi (118084 => 118085)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-05-23 00:09:01 UTC (rev 118084)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-05-23 00:21:07 UTC (rev 118085)
@@ -37,6 +37,7 @@
'chromium/TestShellLinux.cpp',
'chromium/TestShellGtk.cpp',
'chromium/TestShellMac.mm',
+ 'chromium/TestShellStub.cpp',
'chromium/TestShellWin.cpp',
'chromium/TestWebPlugin.cpp',
'chromium/TestWebPlugin.h',
@@ -46,6 +47,12 @@
'chromium/WebPermissions.h',
'chromium/WebPreferences.cpp',
'chromium/WebPreferences.h',
+ 'chromium/WebThemeControlDRTWin.cpp',
+ 'chromium/WebThemeControlDRTWin.h',
+ 'chromium/WebThemeEngineDRTMac.mm',
+ 'chromium/WebThemeEngineDRTMac.h',
+ 'chromium/WebThemeEngineDRTWin.cpp',
+ 'chromium/WebThemeEngineDRTWin.h',
'chromium/WebUserMediaClientMock.cpp',
'chromium/WebUserMediaClientMock.h',
'chromium/WebViewHost.cpp',
@@ -74,26 +81,5 @@
'TestNetscapePlugIn/Tests/PrivateBrowsing.cpp',
'TestNetscapePlugIn/main.cpp',
],
- 'conditions': [
- ['(OS=="linux" and toolkit_uses_gtk!=1) or OS=="android"', {
- 'drt_files': [
- 'chromium/TestShellStub.cpp',
- ],
- }],
- ['OS=="win"', {
- 'drt_files': [
- 'chromium/WebThemeControlDRTWin.cpp',
- 'chromium/WebThemeControlDRTWin.h',
- 'chromium/WebThemeEngineDRTWin.cpp',
- 'chromium/WebThemeEngineDRTWin.h',
- ],
- }],
- ['OS=="mac"', {
- 'drt_files': [
- 'chromium/WebThemeEngineDRTMac.mm',
- 'chromium/WebThemeEngineDRTMac.h',
- ],
- }],
- ],
}
}
