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

Side by Side Diff: net/SConscript

Issue 3202: Make tcp_client_socket_unittest pass on Linux.... (Closed) Base URL: svn://chrome-svn/chrome/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 | « chrome/SConscript ('k') | net/base/tcp_client_socket.h » ('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') 5 Import('env')
6 6
7 env_res = env.Clone() 7 env_res = env.Clone()
8 env_tests = env.Clone() 8 env_tests = env.Clone()
9 env = env.Clone() 9 env = env.Clone()
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 if env['PLATFORM'] == 'darwin': 126 if env['PLATFORM'] == 'darwin':
127 input_files.extend([ 127 input_files.extend([
128 'base/platform_mime_util_mac.mm', 128 'base/platform_mime_util_mac.mm',
129 ]) 129 ])
130 130
131 if env['PLATFORM'] == 'posix': 131 if env['PLATFORM'] == 'posix':
132 input_files.extend([ 132 input_files.extend([
133 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 133 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
134 'base/platform_mime_util_linux.cc', 134 'base/platform_mime_util_linux.cc',
135 'base/tcp_client_socket_libevent.cc',
135 ]) 136 ])
136 137
137 if env['PLATFORM'] in ('darwin', 'posix'): 138 if env['PLATFORM'] in ('darwin', 'posix'):
138 input_files.extend([ 139 input_files.extend([
139 'base/net_util_posix.cc', 140 'base/net_util_posix.cc',
140 'disk_cache/cache_util_posix.cc', 141 'disk_cache/cache_util_posix.cc',
141 'disk_cache/file_posix.cc', 142 'disk_cache/file_posix.cc',
142 'disk_cache/mapped_file_posix.cc', 143 'disk_cache/mapped_file_posix.cc',
143 'disk_cache/os_file_posix.cc', 144 'disk_cache/os_file_posix.cc',
144 ]) 145 ])
(...skipping 16 matching lines...) Expand all
161 CPPPATH = [ 162 CPPPATH = [
162 '..', 163 '..',
163 ], 164 ],
164 CPPDEFINES = [ 165 CPPDEFINES = [
165 'UNIT_TEST', 166 'UNIT_TEST',
166 ], 167 ],
167 LIBS = [ # On Linux, dependencies must follow dependents, so... 168 LIBS = [ # On Linux, dependencies must follow dependents, so...
168 'net', # net must come before base and modp_b64 169 'net', # net must come before base and modp_b64
169 'bzip2', # bzip2 must come before base 170 'bzip2', # bzip2 must come before base
170 'base', 171 'base',
172 'event',
171 'googleurl', 173 'googleurl',
172 'gtest', 174 'gtest',
173 'icuuc', 175 'icuuc',
174 'modp_b64', 176 'modp_b64',
175 'zlib', 177 'zlib',
176 ] 178 ]
177 ) 179 )
178 180
179 env_tests.Append( 181 env_tests.Append(
180 CPPPATH = [ 182 CPPPATH = [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 'base/cookie_policy_unittest.cc', 218 'base/cookie_policy_unittest.cc',
217 'base/data_url_unittest.cc', 219 'base/data_url_unittest.cc',
218 'base/escape_unittest.cc', 220 'base/escape_unittest.cc',
219 'base/gzip_filter_unittest.cc', 221 'base/gzip_filter_unittest.cc',
220 'base/host_resolver_unittest.cc', 222 'base/host_resolver_unittest.cc',
221 'base/mime_sniffer_unittest.cc', 223 'base/mime_sniffer_unittest.cc',
222 'base/mime_util_unittest.cc', 224 'base/mime_util_unittest.cc',
223 'base/net_util_unittest.cc', 225 'base/net_util_unittest.cc',
224 'base/registry_controlled_domain_unittest.cc', 226 'base/registry_controlled_domain_unittest.cc',
225 'base/run_all_unittests.cc', 227 'base/run_all_unittests.cc',
228 'base/tcp_client_socket_unittest.cc',
226 'base/test_completion_callback_unittest.cc', 229 'base/test_completion_callback_unittest.cc',
227 'disk_cache/addr_unittest.cc', 230 'disk_cache/addr_unittest.cc',
228 'disk_cache/block_files_unittest.cc', 231 'disk_cache/block_files_unittest.cc',
229 'disk_cache/disk_cache_test_base.cc', 232 'disk_cache/disk_cache_test_base.cc',
230 'disk_cache/disk_cache_test_util.cc', 233 'disk_cache/disk_cache_test_util.cc',
231 'disk_cache/entry_unittest.cc', 234 'disk_cache/entry_unittest.cc',
232 'disk_cache/mapped_file_unittest.cc', 235 'disk_cache/mapped_file_unittest.cc',
233 'disk_cache/storage_block_unittest.cc', 236 'disk_cache/storage_block_unittest.cc',
234 'http/http_chunked_decoder_unittest.cc', 237 'http/http_chunked_decoder_unittest.cc',
235 'http/http_response_headers_unittest.cc', 238 'http/http_response_headers_unittest.cc',
236 'http/http_vary_data_unittest.cc', 239 'http/http_vary_data_unittest.cc',
237 ] 240 ]
238 241
239 if env['PLATFORM'] == 'win32': 242 if env['PLATFORM'] == 'win32':
240 unittest_files.extend([ 243 unittest_files.extend([
241 'base/directory_lister_unittest.cc', 244 'base/directory_lister_unittest.cc',
242 'base/ssl_config_service_unittest.cc', 245 'base/ssl_config_service_unittest.cc',
243 'base/ssl_client_socket_unittest.cc', 246 'base/ssl_client_socket_unittest.cc',
244 'base/tcp_client_socket_unittest.cc',
245 'base/wininet_util_unittest.cc', 247 'base/wininet_util_unittest.cc',
246 'disk_cache/backend_unittest.cc', 248 'disk_cache/backend_unittest.cc',
247 'http/http_cache_unittest.cc', 249 'http/http_cache_unittest.cc',
248 'http/http_network_layer_unittest.cc', 250 'http/http_network_layer_unittest.cc',
249 'http/http_network_transaction_unittest.cc', 251 'http/http_network_transaction_unittest.cc',
250 'http/http_transaction_unittest.cc', 252 'http/http_transaction_unittest.cc',
251 'http/http_transaction_winhttp_unittest.cc', 253 'http/http_transaction_winhttp_unittest.cc',
252 'http/http_util_unittest.cc', 254 'http/http_util_unittest.cc',
253 'http/winhttp_request_throttle_unittest.cc', 255 'http/winhttp_request_throttle_unittest.cc',
254 'url_request/url_request_unittest.cc', 256 'url_request/url_request_unittest.cc',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 330
329 SConscript(sconscript_files, exports=['env']) 331 SConscript(sconscript_files, exports=['env'])
330 332
331 333
332 # Setup alias for building all parts of net. 334 # Setup alias for building all parts of net.
333 if env['PLATFORM'] == 'win32': 335 if env['PLATFORM'] == 'win32':
334 icudata = '../icudt38.dll' 336 icudata = '../icudt38.dll'
335 else: 337 else:
336 icudata = '../icudt38l.dat' 338 icudata = '../icudt38l.dat'
337 env.Alias('net', ['.', installed_tests, icudata]) 339 env.Alias('net', ['.', installed_tests, icudata])
OLDNEW
« no previous file with comments | « chrome/SConscript ('k') | net/base/tcp_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698