diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 01:04:11 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 01:04:11 +0000 |
| commit | 4c0040c49331c5cb5b88960ecec04ce8a5f0756a (patch) | |
| tree | eb20f932e07a7c3fcb5bf144cba675d48ca791af /base/SConscript | |
| parent | 1b3deed79fc638d3755ba5159108712238d8beb7 (diff) | |
| download | chromium_src-4c0040c49331c5cb5b88960ecec04ce8a5f0756a.zip chromium_src-4c0040c49331c5cb5b88960ecec04ce8a5f0756a.tar.gz chromium_src-4c0040c49331c5cb5b88960ecec04ce8a5f0756a.tar.bz2 | |
To pass string_util_unittest, we need the ICU data file. To get the ICU data file, we need some of PathService, which brings along with it a bunch of other needed functions. So here are a bunch of stubs, along with another file's worth of passing tests. (Based on a patch from Dean.)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/SConscript')
| -rw-r--r-- | base/SConscript | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/base/SConscript b/base/SConscript index de6748f..4bc8d4b 100644 --- a/base/SConscript +++ b/base/SConscript @@ -55,6 +55,7 @@ if env['PLATFORM'] == 'win32': # cross-platform live below. input_files = [ 'at_exit.cc', + 'base_paths.cc', 'base_switches.cc', 'bzip2_error_handler.cc', 'command_line.cc', @@ -93,7 +94,6 @@ if env['PLATFORM'] == 'win32': # TODO: move all these files to either the cross-platform block above or # a platform-specific block below. input_files.extend([ - 'base_paths.cc', 'clipboard_util.cc', 'debug_on_start.cc', 'event_recorder.cc', @@ -160,6 +160,7 @@ if env['PLATFORM'] == 'darwin': if env['PLATFORM'] == 'posix': input_files.extend([ 'atomicops_internals_x86_gcc.cc', + 'base_paths_linux.cc', 'file_util_linux.cc', 'sys_string_conversions_linux.cc', ]) @@ -246,6 +247,7 @@ test_files = [ 'string_escape_unittest.cc', 'string_piece_unittest.cc', 'string_tokenizer_unittest.cc', + 'string_util_unittest.cc', 'time_unittest.cc', 'values_unittest.cc', 'waitable_event_unittest.cc', @@ -274,7 +276,6 @@ if env['PLATFORM'] == 'win32': 'shared_event_unittest.cc', 'shared_memory_unittest.cc', 'stats_table_unittest.cc', - 'string_util_unittest.cc', 'thread_local_storage_unittest.cc', 'thread_unittest.cc', 'timer_unittest.cc', @@ -310,7 +311,11 @@ SConscript(sconscript_dirs, exports=['env']) # Setup alias for all base related targets. -env.Alias('base', ['.', installed_base_unittests, '../icudt38.dll']) +if env['PLATFORM'] == 'win32': + icudata = '../icudt38.dll' +else: + icudata = '../icudt38l.dat' +env.Alias('base', ['.', installed_base_unittests, icudata]) # These aren't ported to other platforms yet. |