| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 ]) | 137 ]) |
| 138 | 138 |
| 139 if env.Bit('mac'): | 139 if env.Bit('mac'): |
| 140 # Mac-specific tests. | 140 # Mac-specific tests. |
| 141 input_files.extend([ | 141 input_files.extend([ |
| 142 'mac_util_unittest.cc', | 142 'mac_util_unittest.cc', |
| 143 ]) | 143 ]) |
| 144 | 144 |
| 145 env.ChromeTestProgram('base_unittests', input_files) | 145 env.ChromeTestProgram('base_unittests', input_files) |
| 146 | 146 |
| 147 env.ChromeMSVSProject('$BASE_DIR/build/base_unittests.vcproj', |
| 148 dependencies = [ |
| 149 '$BASE_DIR/build/base.vcproj', |
| 150 '$ZLIB_DIR/zlib.vcproj', |
| 151 '$ICU38_DIR/build/icu.vcproj', |
| 152 '$BASE_DIR/build/base_gfx.vcproj', |
| 153 '$TESTING_DIR/gtest.vcproj', |
| 154 '$LIBPNG_DIR/libpng.vcproj', |
| 155 '$SKIA_DIR/skia.vcproj', |
| 156 ], |
| 157 guid='{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}') |
| 158 |
| 147 # TODO(sgk) should this be moved into base.lib like everything else? This will | 159 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 148 # require updating a bunch of other SConscripts which link directly against | 160 # require updating a bunch of other SConscripts which link directly against |
| 149 # this generated object file. | 161 # this generated object file. |
| 150 env.StaticObject('perftimer.cc') | 162 env.StaticObject('perftimer.cc') |
| 151 | 163 |
| 152 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 164 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 153 env.StaticObject('run_all_perftests.cc') | 165 env.StaticObject('run_all_perftests.cc') |
| OLD | NEW |