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

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

Issue 8670: Switch to using the message loop rather than gtk_main(). (Closed)
Patch Set: Addressing comments Created 12 years, 1 month 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/glue/webkit_glue.cc ('k') | webkit/tools/test_shell/gtk/test_shell.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 if env['PLATFORM'] == 'win32': 10 if env['PLATFORM'] == 'win32':
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 ], 86 ],
87 ) 87 )
88 elif env['PLATFORM'] in ('posix', 'darwin'): 88 elif env['PLATFORM'] in ('posix', 'darwin'):
89 env.Append( 89 env.Append(
90 LIBS = [ 90 LIBS = [
91 'event', 91 'event',
92 ] 92 ]
93 ) 93 )
94 94
95 input_files = [ 95 input_files = [
96 'layout_test_controller.cc',
96 'simple_resource_loader_bridge.cc', 97 'simple_resource_loader_bridge.cc',
97 'test_navigation_controller.cc', 98 'test_navigation_controller.cc',
98 'test_shell_request_context.cc', 99 'test_shell_request_context.cc',
99 'test_shell_switches.cc', 100 'test_shell_switches.cc',
100 ] 101 ]
101 if env['PLATFORM'] == 'win32': 102 if env['PLATFORM'] == 'win32':
102 # TODO(port): put portable files in above test_files declaration. 103 # TODO(port): put portable files in above test_files declaration.
103 input_files.extend([ 104 input_files.extend([
104 'drag_delegate.cc', 105 'drag_delegate.cc',
105 'drop_delegate.cc', 106 'drop_delegate.cc',
106 'event_sending_controller.cc', 107 'event_sending_controller.cc',
107 'layout_test_controller.cc',
108 'test_shell.cc', 108 'test_shell.cc',
109 'test_shell_win.cc', 109 'test_shell_win.cc',
110 'test_webview_delegate.cc', 110 'test_webview_delegate.cc',
111 'text_input_controller.cc', 111 'text_input_controller.cc',
112 'webview_host.cc', 112 'webview_host.cc',
113 'webwidget_host.cc', 113 'webwidget_host.cc',
114 ]) 114 ])
115 elif env['PLATFORM'] == 'posix': 115 elif env['PLATFORM'] == 'posix':
116 input_files.extend([ 116 input_files.extend([
117 'gtk/test_shell.cc', 117 'gtk/test_shell.cc',
118 'gtk/webwidget_host.cc', 118 'gtk/webwidget_host.cc',
119 'gtk/webview_host.cc', 119 'gtk/webview_host.cc',
120 'gtk/test_webview_delegate.cc',
120 ]) 121 ])
121 122
122 lib = env.ChromeStaticLibrary('test_shell', input_files) 123 lib = env.ChromeStaticLibrary('test_shell', input_files)
123 124
124 125
125 126
126 resources = [] 127 resources = []
127 exe_input_files = [] 128 exe_input_files = []
128 if env['PLATFORM'] == 'win32': 129 if env['PLATFORM'] == 'win32':
129 # TODO(port): figure out what to do with resources. 130 # TODO(port): figure out what to do with resources.
(...skipping 16 matching lines...) Expand all
146 147
147 i = env.Install('$TARGET_ROOT', test_shell) 148 i = env.Install('$TARGET_ROOT', test_shell)
148 env.Alias('webkit', i) 149 env.Alias('webkit', i)
149 150
150 if env['PLATFORM'] == 'win32': 151 if env['PLATFORM'] == 'win32':
151 env.Depends(test_shell, '$V8_DIR/vc80.pdb') 152 env.Depends(test_shell, '$V8_DIR/vc80.pdb')
152 153
153 test_files = [ 154 test_files = [
154 'image_decoder_unittest.cc', 155 'image_decoder_unittest.cc',
155 'run_all_tests.cc', 156 'run_all_tests.cc',
157 'layout_test_controller_unittest.cc',
156 '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc', 158 '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
157 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', 159 '$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
158 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', 160 '$WEBKIT_DIR/glue/glue_serialize_unittest.cc',
159 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', 161 '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc',
160 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', 162 '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc',
161 '$WEBKIT_DIR/glue/regular_expression_unittest.cc', 163 '$WEBKIT_DIR/glue/regular_expression_unittest.cc',
162 '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp', 164 '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp',
163 '$V8_DIR/snapshot-empty$OBJSUFFIX', 165 '$V8_DIR/snapshot-empty$OBJSUFFIX',
164 ] 166 ]
165 167
166 if env['PLATFORM'] == 'win32': 168 if env['PLATFORM'] == 'win32':
167 # TODO(port): put portable files in above test_files declaration. 169 # TODO(port): put portable files in above test_files declaration.
168 test_files.extend([ 170 test_files.extend([
169 'keyboard_unittest.cc', 171 'keyboard_unittest.cc',
170 'layout_test_controller_unittest.cc',
171 'node_leak_test.cc', 172 'node_leak_test.cc',
172 'plugin_tests.cc', 173 'plugin_tests.cc',
173 'run_all_tests.cc', 174 'run_all_tests.cc',
174 'test_shell_test.cc', 175 'test_shell_test.cc',
175 'text_input_controller_unittest.cc', 176 'text_input_controller_unittest.cc',
176 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', 177 '$WEBKIT_DIR/glue/bookmarklet_unittest.cc',
177 '$WEBKIT_DIR/glue/context_menu_unittest.cc', 178 '$WEBKIT_DIR/glue/context_menu_unittest.cc',
178 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', 179 '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
179 '$WEBKIT_DIR/glue/dom_operations_unittest.cc', 180 '$WEBKIT_DIR/glue/dom_operations_unittest.cc',
180 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', 181 '$WEBKIT_DIR/glue/dom_serializer_unittest.cc',
181 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', 182 '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc',
182 '$WEBKIT_DIR/glue/mimetype_unittest.cc', 183 '$WEBKIT_DIR/glue/mimetype_unittest.cc',
183 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', 184 '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc',
184 # Commented out until a regression is fixed and this file is restored. 185 # Commented out until a regression is fixed and this file is restored.
185 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', 186 #'$WEBKIT_DIR/glue/stringimpl_unittest.cc',
186 '$WEBKIT_DIR/glue/webframe_unittest.cc', 187 '$WEBKIT_DIR/glue/webframe_unittest.cc',
187 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', 188 '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc',
188 '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp ', 189 '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp ',
189 '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp ', 190 '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp ',
190 '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp ', 191 '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp ',
191 ]) 192 ])
192 193
193 test_shell_tests = env.ChromeTestProgram('test_shell_tests', 194 test_shell_tests = env.ChromeTestProgram('test_shell_tests',
194 resources + test_files) 195 resources + test_files)
195 i = env.Install('$TARGET_ROOT', test_shell_tests) 196 i = env.Install('$TARGET_ROOT', test_shell_tests)
196 env.Alias('webkit', i) 197 env.Alias('webkit', i)
197 198
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.cc ('k') | webkit/tools/test_shell/gtk/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698