| 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 __doc__ = """ | 5 __doc__ = """ |
| 6 Configuration for building base_unittests{,.exe}. | 6 Configuration for building base_unittests{,.exe}. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 'gfx/uniscribe_unittest.cc', | 134 'gfx/uniscribe_unittest.cc', |
| 135 'gfx/vector_canvas_unittest.cc', | 135 'gfx/vector_canvas_unittest.cc', |
| 136 ] | 136 ] |
| 137 | 137 |
| 138 if env['PLATFORM'] in ('posix', 'darwin'): | 138 if env['PLATFORM'] in ('posix', 'darwin'): |
| 139 #env.ChromeTestProgram('debug_message', ['debug_message.cc']) | 139 #env.ChromeTestProgram('debug_message', ['debug_message.cc']) |
| 140 | 140 |
| 141 # Remove files that still need to be ported from the input_files list. | 141 # Remove files that still need to be ported from the input_files list. |
| 142 # TODO(port): delete files from this list as they get ported. | 142 # TODO(port): delete files from this list as they get ported. |
| 143 to_be_ported_files = [ | 143 to_be_ported_files = [ |
| 144 'clipboard_unittest.cc', | |
| 145 'idletimer_unittest.cc', | 144 'idletimer_unittest.cc', |
| 146 'watchdog_unittest.cc', | 145 'watchdog_unittest.cc', |
| 147 'gfx/native_theme_unittest.cc', | 146 'gfx/native_theme_unittest.cc', |
| 148 'gfx/uniscribe_unittest.cc', | 147 'gfx/uniscribe_unittest.cc', |
| 149 'gfx/vector_canvas_unittest.cc', | 148 'gfx/vector_canvas_unittest.cc', |
| 150 ] | 149 ] |
| 151 for remove in to_be_ported_files: | 150 for remove in to_be_ported_files: |
| 152 input_files.remove(remove) | 151 input_files.remove(remove) |
| 153 | 152 |
| 154 if env['PLATFORM'] == 'darwin': | 153 if env['PLATFORM'] == 'darwin': |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 189 |
| 191 env.Alias('base', installed_base_unittests) | 190 env.Alias('base', installed_base_unittests) |
| 192 | 191 |
| 193 # TODO(sgk) should this be moved into base.lib like everything else? This will | 192 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 194 # require updating a bunch of other SConscripts which link directly against | 193 # require updating a bunch of other SConscripts which link directly against |
| 195 # this generated object file. | 194 # this generated object file. |
| 196 env.StaticObject('perftimer.cc') | 195 env.StaticObject('perftimer.cc') |
| 197 | 196 |
| 198 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 197 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 199 env.StaticObject('run_all_perftests.cc') | 198 env.StaticObject('run_all_perftests.cc') |
| OLD | NEW |