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

Side by Side Diff: base/base_unittests.scons

Issue 14113: Remove few more errors in mac scons build. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years 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 | « base/base_lib.scons ('k') | build/SConscript.main » ('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 __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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 'sys_string_conversions_unittest.cc', 132 'sys_string_conversions_unittest.cc',
133 'time_unittest_win.cc', 133 'time_unittest_win.cc',
134 'win_util_unittest.cc', 134 'win_util_unittest.cc',
135 'wmi_util_unittest.cc', 135 'wmi_util_unittest.cc',
136 ]) 136 ])
137 137
138 if env['PLATFORM'] == 'darwin': 138 if env['PLATFORM'] == 'darwin':
139 # Mac-specific tests. 139 # Mac-specific tests.
140 input_files.extend([ 140 input_files.extend([
141 'mac_util_unittest.cc', 141 'mac_util_unittest.cc',
142 'platform_test_mac.mm',
143 ]) 142 ])
144 143
145 env.ChromeTestProgram('base_unittests', input_files) 144 env.ChromeTestProgram('base_unittests', input_files)
146 145
147 # TODO(sgk) should this be moved into base.lib like everything else? This will 146 # 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 147 # require updating a bunch of other SConscripts which link directly against
149 # this generated object file. 148 # this generated object file.
150 env.StaticObject('perftimer.cc') 149 env.StaticObject('perftimer.cc')
151 150
152 # Since run_all_perftests supplies a main, we cannot have it in base.lib 151 # Since run_all_perftests supplies a main, we cannot have it in base.lib
153 env.StaticObject('run_all_perftests.cc') 152 env.StaticObject('run_all_perftests.cc')
OLDNEW
« no previous file with comments | « base/base_lib.scons ('k') | build/SConscript.main » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698