Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: webkit/tools/test_shell/SConscript

Issue 1606: hodgepodge for test_shell.cc (Closed)
Patch Set: update some comments Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/SConscript ('k') | webkit/tools/test_shell/run_all_tests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 Import('env', 'env_res') 5 Import('env', 'env_res')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 env_res = env_res.Clone() 8 env_res = env_res.Clone()
9 9
10 env_res.Append( 10 env_res.Append(
(...skipping 11 matching lines...) Expand all
22 CPPPATH = [ 22 CPPPATH = [
23 '$BREAKPAD_DIR/src', 23 '$BREAKPAD_DIR/src',
24 '$WEBKIT_DIR/glue', 24 '$WEBKIT_DIR/glue',
25 '$GTEST_DIR/include', 25 '$GTEST_DIR/include',
26 ], 26 ],
27 LIBS = [ 27 LIBS = [
28 'test_shell', 28 'test_shell',
29 'base', 29 'base',
30 'base_gfx', 30 'base_gfx',
31 'breakpad_handler', 31 'breakpad_handler',
32 'breakpad_sender',
33 'googleurl', 32 'googleurl',
34 'net', 33 'net',
35 'skia', 34 'skia',
36 'gtest', 35 'gtest',
37 'bzip2', 36 'bzip2',
38 'icuuc', 37 'icuuc',
39 'libjpeg', 38 'libjpeg',
40 'libpng', 39 'libpng',
41 'libxml', 40 'libxml',
42 'libxslt', 41 'libxslt',
43 'modp_b64', 42 'modp_b64',
44 'zlib', 43 'zlib',
45 'v8',
46 'JavaScriptCore_pcre', 44 'JavaScriptCore_pcre',
47 'Port',
48 'activex_shim',
49 'WTF', 45 'WTF',
50 'V8Bindings', 46 'V8Bindings',
51 'WebCore',
52 'default_plugin', 47 'default_plugin',
53 'Glue',
54 ], 48 ],
55 ) 49 )
56 50
57 env.Append( 51 if env['PLATFORM'] == 'win32':
58 CCFLAGS = [ 52 env.Append(
59 '/TP', 53 CCFLAGS = [
60 '/WX', 54 '/TP',
61 '/Wp64', 55 '/WX',
62 ], 56 '/Wp64',
57 ],
63 58
64 LIBS = [ 59 LIBS = [
65 'comctl32.lib', 60 'breakpad_sender', # TODO(port): move back to shared library list.
66 'rpcrt4.lib', 61 'v8', # TODO(port): move back to shared library list.
67 'shlwapi.lib', 62 'Port', # TODO(port): move back to shared library list.
68 'winmm.lib', 63 'activex_shim', # TODO(port): move back to shared library list.
69 ], 64 'WebCore', # TODO(port): move back to shared library list.
65 'Glue', # TODO(port): move back to shared library list.
66 'comctl32.lib',
67 'rpcrt4.lib',
68 'shlwapi.lib',
69 'winmm.lib',
70 ],
70 71
71 LINKFLAGS = [ 72 LINKFLAGS = [
72 '/DELAYLOAD:"ws2_32.dll"', 73 '/DELAYLOAD:"ws2_32.dll"',
73 '/DELAYLOAD:"dwmapi.dll"', 74 '/DELAYLOAD:"dwmapi.dll"',
74 '/DELAYLOAD:"uxtheme.dll"', 75 '/DELAYLOAD:"uxtheme.dll"',
75 '/FIXED:No', 76 '/FIXED:No',
76 '/SUBSYSTEM:CONSOLE', 77 '/SUBSYSTEM:CONSOLE',
77 '/MACHINE:X86', 78 '/MACHINE:X86',
78 '/safeseh', 79 '/safeseh',
79 '/dynamicbase', 80 '/dynamicbase',
80 '/ignore:4199', 81 '/ignore:4199',
81 '/nxcompat', 82 '/nxcompat',
82 ], 83 ],
83 ) 84 )
84 85
85 input_files = [ 86 input_files = [
86 'drag_delegate.cc',
87 'drop_delegate.cc',
88 'event_sending_controller.cc',
89 'layout_test_controller.cc',
90 'simple_resource_loader_bridge.cc',
91 'test_navigation_controller.cc', 87 'test_navigation_controller.cc',
92 'test_shell.cc',
93 'test_shell_switches.cc',
94 'test_shell_request_context.cc',
95 'test_webview_delegate.cc',
96 'text_input_controller.cc',
97 'webview_host.cc',
98 'webwidget_host.cc',
99 ] 88 ]
89 if env['PLATFORM'] == 'win32':
90 # Some of these aren't really Windows-specific, they're just here until
91 # we have the port versions working.
92 input_files = [
93 'drag_delegate.cc',
94 'drop_delegate.cc',
95 'event_sending_controller.cc',
96 'layout_test_controller.cc',
97 'simple_resource_loader_bridge.cc',
98 'test_shell.cc',
99 'test_shell_switches.cc',
100 'test_shell_request_context.cc',
101 'test_webview_delegate.cc',
102 'text_input_controller.cc',
103 'webview_host.cc',
104 'webwidget_host.cc',
105 ]
100 106
101 lib = env.ChromeStaticLibrary('test_shell', input_files) 107 lib = env.ChromeStaticLibrary('test_shell', input_files)
102 108
103 109
104 110
105 resources = [ 111 # Resources are temporarily disabled on non-win32 until we figure out
106 env_res.RES('resources/test_shell.rc'), 112 # what to do.
107 '$NET_DIR/net_resources.res', 113 resources = []
108 '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res', 114 if env['PLATFORM'] == 'win32':
109 ] 115 resources = [
116 env_res.RES('resources/test_shell.rc'),
117 '$NET_DIR/net_resources.res',
118 '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res',
119 ]
110 120
111 121
112 exe_input_files = [ 122 exe_input_files = [
113 'test_shell_main.cc', 123 'test_shell_main.cc',
114 '$V8_DIR/snapshot-empty$OBJSUFFIX' 124 '$V8_DIR/snapshot-empty$OBJSUFFIX'
115 ] 125 ]
116 126
117 test_shell = env.ChromeProgram('test_shell', resources + exe_input_files) 127 if env['PLATFORM'] == 'win32':
118 i = env.Install('$TARGET_ROOT', test_shell) 128 test_shell = env.ChromeProgram('test_shell', resources + exe_input_files)
119 env.Alias('webkit', i) 129 i = env.Install('$TARGET_ROOT', test_shell)
130 env.Alias('webkit', i)
120 131
121 # This call can NOT use $WEBKIT_DIR because we need to copy 132 # This call can NOT use $WEBKIT_DIR because we need to copy
122 # directly from the source location. 133 # directly from the source location.
123 i = env.Install('$TARGET_ROOT', '#/../webkit/tools/test_shell/resources/fonts') 134 i = env.Install('$TARGET_ROOT', '#/../webkit/tools/test_shell/resources/fonts' )
124 env.Alias('webkit', i) 135 env.Alias('webkit', i)
125 136
126 env.Depends(test_shell, '$V8_DIR/vc80.pdb') 137 env.Depends(test_shell, '$V8_DIR/vc80.pdb')
127
128 138
129 test_files = [ 139 test_files = [
130 'drag_delegate.cc', 140 'test_shell.cc',
131 'drop_delegate.cc',
132 'event_sending_controller.cc',
133 'image_decoder_unittest.cc',
134 'keyboard_unittest.cc',
135 'layout_test_controller.cc',
136 'layout_test_controller_unittest.cc',
137 'node_leak_test.cc',
138 'plugin_tests.cc',
139 'run_all_tests.cc', 141 'run_all_tests.cc',
140 'simple_resource_loader_bridge.cc', 142 ]
141 'test_navigation_controller.cc',
142 'test_shell.cc',
143 'test_shell_request_context.cc',
144 'test_shell_switches.cc',
145 'test_shell_test.cc',
146 'test_webview_delegate.cc',
147 'text_input_controller.cc',
148 'text_input_controller_unittest.cc',
149 'webview_host.cc',
150 'webwidget_host.cc',
151 '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
152 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
153 '$WEBKIT_DIR/glue/context_menu_unittest.cc',
154 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
155 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
156 '$WEBKIT_DIR/glue/dom_operations_unittest.cc',
157 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc',
158 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc',
159 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc',
160 '$WEBKIT_DIR/glue/mimetype_unittest.cc',
161 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc',
162 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc',
163 '$WEBKIT_DIR/glue/regular_expression_unittest.cc',
164 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc',
165 # Commented out until a regression is fixed and this file is restored.
166 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc',
167 '$WEBKIT_DIR/glue/webframe_unittest.cc',
168 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc',
169 '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp',
170 '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp',
171 '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp',
172 '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp',
173 143
174 '$V8_DIR/snapshot-empty$OBJSUFFIX', 144 if env['PLATFORM'] == 'win32':
175 ] 145 # Some of these aren't really Windows-specific, they're just here until
146 # we have the port versions working.
147 test_files.append([
148 'drag_delegate.cc',
149 'drop_delegate.cc',
150 'event_sending_controller.cc',
151 'image_decoder_unittest.cc',
152 'keyboard_unittest.cc',
153 'layout_test_controller.cc',
154 'layout_test_controller_unittest.cc',
155 'node_leak_test.cc',
156 'plugin_tests.cc',
157 'simple_resource_loader_bridge.cc',
158 'test_navigation_controller.cc',
159 'test_shell_request_context.cc',
160 'test_shell_switches.cc',
161 'test_shell_test.cc',
162 'test_webview_delegate.cc',
163 'text_input_controller.cc',
164 'text_input_controller_unittest.cc',
165 'webview_host.cc',
166 'webwidget_host.cc',
167 '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
168 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
169 '$WEBKIT_DIR/glue/context_menu_unittest.cc',
170 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
171 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
172 '$WEBKIT_DIR/glue/dom_operations_unittest.cc',
173 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc',
174 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc',
175 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc',
176 '$WEBKIT_DIR/glue/mimetype_unittest.cc',
177 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc',
178 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc',
179 '$WEBKIT_DIR/glue/regular_expression_unittest.cc',
180 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc',
181 # Commented out until a regression is fixed and this file is restored.
182 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc',
183 '$WEBKIT_DIR/glue/webframe_unittest.cc',
184 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc',
185 '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp',
186 '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp',
187 '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp',
188 '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp',
189
190 '$V8_DIR/snapshot-empty$OBJSUFFIX',
191 ])
176 192
177 test_shell_tests = env.ChromeTestProgram('test_shell_tests', 193 test_shell_tests = env.ChromeTestProgram('test_shell_tests',
178 resources + test_files) 194 resources + test_files)
179 i = env.Install('$TARGET_ROOT', test_shell_tests) 195 i = env.Install('$TARGET_ROOT', test_shell_tests)
180 env.Alias('webkit', i) 196 env.Alias('webkit', i)
181 197
OLDNEW
« no previous file with comments | « webkit/SConscript ('k') | webkit/tools/test_shell/run_all_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698