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

Side by Side Diff: chrome/SConscript.unit_tests

Issue 3149: Porting changes in chrome/{browser,common}, also enabling more unit tests.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/SConscript » ('j') | chrome/browser/session_startup_pref.cc » ('J')
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_test') 5 Import('env_test')
6 6
7 env_test = env_test.Clone() 7 env_test = env_test.Clone()
8 8
9 if env_test['PLATFORM'] == 'posix':
10 env_test.Prepend(
11 LIBS = [
12 'event',
13 ]
14 )
15
9 env_test.Prepend( 16 env_test.Prepend(
10 CPPPATH = [ 17 CPPPATH = [
11 '$ICU38_DIR/public/common', 18 '$ICU38_DIR/public/common',
12 '$ICU38_DIR/public/i18n', 19 '$ICU38_DIR/public/i18n',
13 '$LIBXML_DIR/include', 20 '$LIBXML_DIR/include',
14 '$LIBXML_DIR/scons/include', 21 '$LIBXML_DIR/scons/include',
15 '$SKIA_DIR/include', 22 '$SKIA_DIR/include',
16 '$SKIA_DIR/include/corecg', 23 '$SKIA_DIR/include/corecg',
17 '$SKIA_DIR/platform', 24 '$SKIA_DIR/platform',
18 '$ZLIB_DIR', 25 '$ZLIB_DIR',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 'third_party/hunspell/hunspell.lib', 118 'third_party/hunspell/hunspell.lib',
112 'third_party/sqlite/sqlite.lib', 119 'third_party/sqlite/sqlite.lib',
113 'views/views.lib', 120 'views/views.lib',
114 ] 121 ]
115 122
116 unit_test_files = [] 123 unit_test_files = []
117 124
118 if env_test['PLATFORM'] in ('posix', 'win32'): 125 if env_test['PLATFORM'] in ('posix', 'win32'):
119 # TODO(port): Port to Mac. 126 # TODO(port): Port to Mac.
120 unit_test_files.extend([ 127 unit_test_files.extend([
128 'browser/chrome_thread_unittest.cc',
129 'browser/metrics_response_unittest.cc',
121 'browser/net/dns_host_info_unittest.cc', 130 'browser/net/dns_host_info_unittest.cc',
131 'browser/printing/page_range_unittest.cc',
132 'browser/printing/page_setup_unittest.cc',
133 'browser/printing/units_unittest.cc',
122 'browser/safe_browsing/chunk_range_unittest.cc', 134 'browser/safe_browsing/chunk_range_unittest.cc',
123 'browser/safe_browsing/protocol_parser_unittest.cc', 135 'browser/safe_browsing/protocol_parser_unittest.cc',
124 'browser/safe_browsing/safe_browsing_util_unittest.cc', 136 'browser/safe_browsing/safe_browsing_util_unittest.cc',
137 'common/animation_unittest.cc',
138 'common/bzip2_unittest.cc',
139 'common/jpeg_codec_unittest.cc',
140 'common/json_value_serializer_unittest.cc',
125 'test/unit/run_all_unittests.cc', 141 'test/unit/run_all_unittests.cc',
126 ]) 142 ])
127 143
128 env_test.Prepend( 144 env_test.Prepend(
129 LIBS = [ 145 LIBS = [
130 'browser', 146 'browser',
147 'common',
131 ], 148 ],
132 ) 149 )
133 150
134 if env_test['PLATFORM'] == 'win32': 151 if env_test['PLATFORM'] == 'win32':
135 # TODO(port): Port these. 152 # TODO(port): Port these.
136 unit_test_files.extend([ 153 unit_test_files.extend([
137 'browser/autocomplete/autocomplete_unittest.cc', 154 'browser/autocomplete/autocomplete_unittest.cc',
138 'browser/autocomplete/history_contents_provider_unittest.cc', 155 'browser/autocomplete/history_contents_provider_unittest.cc',
139 'browser/autocomplete/history_url_provider_unittest.cc', 156 'browser/autocomplete/history_url_provider_unittest.cc',
140 'browser/autocomplete/keyword_provider_unittest.cc', 157 'browser/autocomplete/keyword_provider_unittest.cc',
141 'browser/back_forward_menu_model_unittest.cc', 158 'browser/back_forward_menu_model_unittest.cc',
142 'browser/bookmark_bar_context_menu_controller_test.cc', 159 'browser/bookmark_bar_context_menu_controller_test.cc',
143 'browser/bookmarks/bookmark_bar_unittest.cc', 160 'browser/bookmarks/bookmark_bar_unittest.cc',
144 'browser/bookmarks/bookmark_drag_data_unittest.cc', 161 'browser/bookmarks/bookmark_drag_data_unittest.cc',
145 'browser/cache_manager_host_unittest.cc', 162 'browser/cache_manager_host_unittest.cc',
146 'browser/chrome_thread_unittest.cc',
147 'browser/controller_unittest.cc', 163 'browser/controller_unittest.cc',
148 'browser/download_manager_unittest.cc', 164 'browser/download_manager_unittest.cc',
149 'browser/encryptor_unittest.cc', 165 'browser/encryptor_unittest.cc',
150 'browser/firefox_importer_unittest.cc', 166 'browser/firefox_importer_unittest.cc',
151 'browser/google_url_tracker_unittest.cc', 167 'browser/google_url_tracker_unittest.cc',
152 'browser/history/expire_history_backend_unittest.cc', 168 'browser/history/expire_history_backend_unittest.cc',
153 'browser/history/history_backend_unittest.cc', 169 'browser/history/history_backend_unittest.cc',
154 'browser/history/history_querying_unittest.cc', 170 'browser/history/history_querying_unittest.cc',
155 'browser/history/history_types_unittest.cc', 171 'browser/history/history_types_unittest.cc',
156 'browser/history/history_unittest.cc', 172 'browser/history/history_unittest.cc',
157 'browser/history/query_parser_unittest.cc', 173 'browser/history/query_parser_unittest.cc',
158 'browser/history/snippet_unittest.cc', 174 'browser/history/snippet_unittest.cc',
159 'browser/history/starred_url_database_unittest.cc', 175 'browser/history/starred_url_database_unittest.cc',
160 'browser/history/text_database_manager_unittest.cc', 176 'browser/history/text_database_manager_unittest.cc',
161 'browser/history/text_database_unittest.cc', 177 'browser/history/text_database_unittest.cc',
162 'browser/history/thumbnail_database_unittest.cc', 178 'browser/history/thumbnail_database_unittest.cc',
163 'browser/history/url_database_unittest.cc', 179 'browser/history/url_database_unittest.cc',
164 'browser/history/visit_database_unittest.cc', 180 'browser/history/visit_database_unittest.cc',
165 'browser/history/visit_tracker_unittest.cc', 181 'browser/history/visit_tracker_unittest.cc',
166 'browser/importer_unittest.cc', 182 'browser/importer_unittest.cc',
167 'browser/metrics_log_unittest.cc', 183 'browser/metrics_log_unittest.cc',
168 'browser/metrics_response_unittest.cc',
169 'browser/navigation_controller_unittest.cc', 184 'browser/navigation_controller_unittest.cc',
170 'browser/net/dns_master_unittest.cc', 185 'browser/net/dns_master_unittest.cc',
171 'browser/password_form_manager_unittest.cc', 186 'browser/password_form_manager_unittest.cc',
172 'browser/printing/page_number_unittest.cc', 187 'browser/printing/page_number_unittest.cc',
173 'browser/printing/page_overlays_unittest.cc', 188 'browser/printing/page_overlays_unittest.cc',
174 'browser/printing/page_range_unittest.cc',
175 'browser/printing/page_setup_unittest.cc',
176 'browser/printing/units_unittest.cc',
177 'browser/printing/win_printing_context_unittest.cc', 189 'browser/printing/win_printing_context_unittest.cc',
178 'browser/profile_manager_unittest.cc', 190 'browser/profile_manager_unittest.cc',
179 'browser/renderer_security_policy_unittest.cc', 191 'browser/renderer_security_policy_unittest.cc',
180 'browser/resource_dispatcher_host_unittest.cc', 192 'browser/resource_dispatcher_host_unittest.cc',
181 'browser/rlz/rlz_unittest.cc', 193 'browser/rlz/rlz_unittest.cc',
182 'browser/safe_browsing/bloom_filter_unittest.cc', 194 'browser/safe_browsing/bloom_filter_unittest.cc',
183 'browser/safe_browsing/protocol_manager_unittest.cc', 195 'browser/safe_browsing/protocol_manager_unittest.cc',
184 'browser/safe_browsing/safe_browsing_database_unittest.cc', 196 'browser/safe_browsing/safe_browsing_database_unittest.cc',
185 'browser/save_package_unittest.cc', 197 'browser/save_package_unittest.cc',
186 'browser/session_backend_unittest.cc', 198 'browser/session_backend_unittest.cc',
187 'browser/session_service_test_helper.cc', 199 'browser/session_service_test_helper.cc',
188 'browser/session_service_unittest.cc', 200 'browser/session_service_unittest.cc',
189 'browser/site_instance_unittest.cc', 201 'browser/site_instance_unittest.cc',
190 'browser/tabs/tab_strip_model_unittest.cc', 202 'browser/tabs/tab_strip_model_unittest.cc',
191 'browser/template_url_model_unittest.cc', 203 'browser/template_url_model_unittest.cc',
192 'browser/template_url_parser_unittest.cc', 204 'browser/template_url_parser_unittest.cc',
193 'browser/template_url_unittest.cc', 205 'browser/template_url_unittest.cc',
194 'browser/title_chomper_unittest.cc', 206 'browser/title_chomper_unittest.cc',
195 'browser/url_fetcher_unittest.cc', 207 'browser/url_fetcher_unittest.cc',
196 'browser/url_fixer_upper_unittest.cc', 208 'browser/url_fixer_upper_unittest.cc',
197 'browser/views/bookmark_bar_view_test.cc', 209 'browser/views/bookmark_bar_view_test.cc',
198 'browser/views/bookmark_editor_view_unittest.cc', 210 'browser/views/bookmark_editor_view_unittest.cc',
199 'browser/views/keyword_editor_view_unittest.cc', 211 'browser/views/keyword_editor_view_unittest.cc',
200 'browser/visitedlink_unittest.cc', 212 'browser/visitedlink_unittest.cc',
201 'browser/web_contents_unittest.cc', 213 'browser/web_contents_unittest.cc',
202 'browser/webdata/web_database_unittest.cc', 214 'browser/webdata/web_database_unittest.cc',
203 'browser/window_sizer_unittest.cc', 215 'browser/window_sizer_unittest.cc',
204 'common/animation_unittest.cc',
205 'common/bzip2_unittest.cc',
206 'common/chrome_plugin_unittest.cc', 216 'common/chrome_plugin_unittest.cc',
207 'common/gfx/emf_unittest.cc', 217 'common/gfx/emf_unittest.cc',
208 'common/gfx/icon_util_unittest.cc', 218 'common/gfx/icon_util_unittest.cc',
209 'common/gfx/url_elider_unittest.cc', 219 'common/gfx/url_elider_unittest.cc',
210 'common/ipc_message_unittest.cc', 220 'common/ipc_message_unittest.cc',
211 'common/ipc_sync_channel_unittest.cc', 221 'common/ipc_sync_channel_unittest.cc',
212 'common/ipc_sync_message_unittest.cc', 222 'common/ipc_sync_message_unittest.cc',
213 'common/jpeg_codec_unittest.cc',
214 'common/json_value_serializer_unittest.cc',
215 'common/l10n_util_unittest.cc', 223 'common/l10n_util_unittest.cc',
216 'common/mru_cache_unittest.cc', 224 'common/mru_cache_unittest.cc',
217 'common/notification_service_unittest.cc', 225 'common/notification_service_unittest.cc',
218 'common/os_exchange_data_unittest.cc', 226 'common/os_exchange_data_unittest.cc',
219 'common/pref_member_unittest.cc', 227 'common/pref_member_unittest.cc',
220 'common/pref_service_unittest.cc', 228 'common/pref_service_unittest.cc',
221 'common/resource_dispatcher_unittest.cc', 229 'common/resource_dispatcher_unittest.cc',
222 'common/time_format_unittest.cc', 230 'common/time_format_unittest.cc',
223 'common/win_util_unittest.cc', 231 'common/win_util_unittest.cc',
224 'renderer/net/render_dns_master_unittest.cc', 232 'renderer/net/render_dns_master_unittest.cc',
(...skipping 19 matching lines...) Expand all
244 252
245 test_program_files = unit_test_files 253 test_program_files = unit_test_files
246 if env_test['PLATFORM'] == 'win32': 254 if env_test['PLATFORM'] == 'win32':
247 # This is probably Windows-specific. 255 # This is probably Windows-specific.
248 test_program_files.extend(libs) 256 test_program_files.extend(libs)
249 unit_tests = env_test.ChromeTestProgram('unit_tests', test_program_files) 257 unit_tests = env_test.ChromeTestProgram('unit_tests', test_program_files)
250 258
251 i = env_test.Install('$TARGET_ROOT', unit_tests) 259 i = env_test.Install('$TARGET_ROOT', unit_tests)
252 Alias('chrome', i) 260 Alias('chrome', i)
253 261
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/SConscript » ('j') | chrome/browser/session_startup_pref.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698