| 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 = env.Clone() | 7 env = env.Clone() |
| 8 env_tests = env.Clone() | 8 env_tests = env.Clone() |
| 9 | 9 |
| 10 env.Prepend( | 10 env.Prepend( |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 'base_paths.cc', | 33 'base_paths.cc', |
| 34 'base_switches.cc', | 34 'base_switches.cc', |
| 35 'bzip2_error_handler.cc', | 35 'bzip2_error_handler.cc', |
| 36 'command_line.cc', | 36 'command_line.cc', |
| 37 'debug_util.cc', | 37 'debug_util.cc', |
| 38 'file_util.cc', | 38 'file_util.cc', |
| 39 'histogram.cc', | 39 'histogram.cc', |
| 40 'icu_util.cc', | 40 'icu_util.cc', |
| 41 'json_reader.cc', | 41 'json_reader.cc', |
| 42 'json_writer.cc', | 42 'json_writer.cc', |
| 43 'lazy_instance.cc', |
| 43 'lock.cc', | 44 'lock.cc', |
| 44 'logging.cc', | 45 'logging.cc', |
| 45 'md5.cc', | 46 'md5.cc', |
| 46 'memory_debug.cc', | 47 'memory_debug.cc', |
| 47 'message_loop.cc', | 48 'message_loop.cc', |
| 48 'message_pump_default.cc', | 49 'message_pump_default.cc', |
| 49 'non_thread_safe.cc', | 50 'non_thread_safe.cc', |
| 50 'path_service.cc', | 51 'path_service.cc', |
| 51 'pickle.cc', | 52 'pickle.cc', |
| 52 'ref_counted.cc', | 53 'ref_counted.cc', |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 # These test files work on *all* platforms; tests that don't work | 227 # These test files work on *all* platforms; tests that don't work |
| 227 # cross-platform live below. | 228 # cross-platform live below. |
| 228 test_files = [ | 229 test_files = [ |
| 229 'at_exit_unittest.cc', | 230 'at_exit_unittest.cc', |
| 230 'atomicops_unittest.cc', | 231 'atomicops_unittest.cc', |
| 231 'command_line_unittest.cc', | 232 'command_line_unittest.cc', |
| 232 'condition_variable_unittest.cc', | 233 'condition_variable_unittest.cc', |
| 233 'histogram_unittest.cc', | 234 'histogram_unittest.cc', |
| 234 'json_reader_unittest.cc', | 235 'json_reader_unittest.cc', |
| 235 'json_writer_unittest.cc', | 236 'json_writer_unittest.cc', |
| 237 'lazy_instance_unittest.cc', |
| 236 'linked_ptr_unittest.cc', | 238 'linked_ptr_unittest.cc', |
| 237 'message_loop_unittest.cc', | 239 'message_loop_unittest.cc', |
| 238 'observer_list_unittest.cc', | 240 'observer_list_unittest.cc', |
| 239 'path_service_unittest.cc', | 241 'path_service_unittest.cc', |
| 240 'pickle_unittest.cc', | 242 'pickle_unittest.cc', |
| 241 'pr_time_unittest.cc', | 243 'pr_time_unittest.cc', |
| 242 'ref_counted_unittest.cc', | 244 'ref_counted_unittest.cc', |
| 243 'run_all_unittests.cc', | 245 'run_all_unittests.cc', |
| 244 'scoped_ptr_unittest.cc', | 246 'scoped_ptr_unittest.cc', |
| 245 'sha2_unittest.cc', | 247 'sha2_unittest.cc', |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 env.Alias('base', ['.', installed_base_unittests, icudata]) | 324 env.Alias('base', ['.', installed_base_unittests, icudata]) |
| 323 | 325 |
| 324 # TODO(sgk) should this be moved into base.lib like everything else? This will | 326 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 325 # require updating a bunch of other SConscripts which link directly against | 327 # require updating a bunch of other SConscripts which link directly against |
| 326 # this generated object file. | 328 # this generated object file. |
| 327 env_tests.StaticObject('perftimer.cc') | 329 env_tests.StaticObject('perftimer.cc') |
| 328 | 330 |
| 329 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 331 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 330 env_tests.StaticObject('run_all_perftests.cc') | 332 env_tests.StaticObject('run_all_perftests.cc') |
| 331 | 333 |
| OLD | NEW |