| OLD | NEW |
| 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 | 275 |
| 276 if env['PLATFORM'] == 'darwin': | 276 if env['PLATFORM'] == 'darwin': |
| 277 unittest_files.extend([ | 277 unittest_files.extend([ |
| 278 '../base/platform_test_mac.o', | 278 '../base/platform_test_mac.o', |
| 279 ]) | 279 ]) |
| 280 | 280 |
| 281 net_unittests = env_tests.ChromeTestProgram('net_unittests', unittest_files) | 281 net_unittests = env_tests.ChromeTestProgram('net_unittests', unittest_files) |
| 282 | 282 |
| 283 install_targets = net_unittests[:] | 283 install_targets = net_unittests[:] |
| 284 | 284 |
| 285 if env['PLATFORM'] in ('posix', 'win32'): |
| 286 |
| 287 net_perftests = env_tests.ChromeTestProgram( |
| 288 'net_perftests', |
| 289 ['disk_cache/disk_cache_test_util.cc', |
| 290 'disk_cache/disk_cache_perftest.cc', |
| 291 'base/cookie_monster_perftest.cc', |
| 292 # TODO(sgk): avoid using .cc from base directly |
| 293 '$BASE_DIR/run_all_perftests$OBJSUFFIX', |
| 294 '$BASE_DIR/perftimer$OBJSUFFIX'] |
| 295 ) |
| 296 |
| 297 install_targets.extend([ |
| 298 net_perftests |
| 299 ]) |
| 300 |
| 285 if env['PLATFORM'] == 'win32': | 301 if env['PLATFORM'] == 'win32': |
| 286 stress_cache = env_tests.ChromeTestProgram( | 302 stress_cache = env_tests.ChromeTestProgram( |
| 287 'stress_cache', | 303 'stress_cache', |
| 288 ['disk_cache/stress_cache.cc', | 304 ['disk_cache/stress_cache.cc', |
| 289 'disk_cache/disk_cache_test_util.cc'] | 305 'disk_cache/disk_cache_test_util.cc'] |
| 290 ) | 306 ) |
| 291 | 307 |
| 292 crash_cache = env_tests.ChromeTestProgram( | 308 crash_cache = env_tests.ChromeTestProgram( |
| 293 'crash_cache', | 309 'crash_cache', |
| 294 ['tools/crash_cache/crash_cache.cc', | 310 ['tools/crash_cache/crash_cache.cc', |
| 295 'disk_cache/disk_cache_test_util.cc'] | 311 'disk_cache/disk_cache_test_util.cc'] |
| 296 ) | 312 ) |
| 297 | 313 |
| 298 net_perftests = env_tests.ChromeTestProgram( | |
| 299 'net_perftests', | |
| 300 ['disk_cache/disk_cache_test_util.cc', | |
| 301 'disk_cache/disk_cache_perftest.cc', | |
| 302 'base/cookie_monster_perftest.cc', | |
| 303 # TODO(sgk): avoid using .cc from base directly | |
| 304 '$BASE_DIR/run_all_perftests$OBJSUFFIX', | |
| 305 '$BASE_DIR/perftimer$OBJSUFFIX'] | |
| 306 ) | |
| 307 | |
| 308 install_targets.extend([ | 314 install_targets.extend([ |
| 309 stress_cache, | 315 stress_cache, |
| 310 crash_cache, | 316 crash_cache, |
| 311 net_perftests, | |
| 312 ]) | 317 ]) |
| 313 | 318 |
| 314 | 319 |
| 315 # Create install of tests. | 320 # Create install of tests. |
| 316 installed_tests = env.Install('$TARGET_ROOT', install_targets) | 321 installed_tests = env.Install('$TARGET_ROOT', install_targets) |
| 317 | 322 |
| 318 | 323 |
| 319 if env['PLATFORM'] == 'win32': | 324 if env['PLATFORM'] == 'win32': |
| 320 env_res.Append( | 325 env_res.Append( |
| 321 CPPPATH = [ | 326 CPPPATH = [ |
| (...skipping 20 matching lines...) Expand all Loading... |
| 342 # TODO: We need to port tld_cleanup before this will work on other | 347 # TODO: We need to port tld_cleanup before this will work on other |
| 343 # platforms. | 348 # platforms. |
| 344 sconscript_files = [ | 349 sconscript_files = [ |
| 345 'tools/tld_cleanup/SConscript', | 350 'tools/tld_cleanup/SConscript', |
| 346 ] | 351 ] |
| 347 | 352 |
| 348 SConscript(sconscript_files, exports=['env']) | 353 SConscript(sconscript_files, exports=['env']) |
| 349 | 354 |
| 350 | 355 |
| 351 env.Alias('net', ['.', installed_tests]) | 356 env.Alias('net', ['.', installed_tests]) |
| OLD | NEW |