diff options
| author | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 11:24:35 +0000 |
|---|---|---|
| committer | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 11:24:35 +0000 |
| commit | b7a34ef99e9cb6fc6f268b8bf210fe846a13542a (patch) | |
| tree | 64999fb1ae8b7b2a8560a6e6ad2675522718b89f /base | |
| parent | 8c2347e799aacd6dfa262f4361f065adc2cd302b (diff) | |
| download | chromium_src-b7a34ef99e9cb6fc6f268b8bf210fe846a13542a.zip chromium_src-b7a34ef99e9cb6fc6f268b8bf210fe846a13542a.tar.gz chromium_src-b7a34ef99e9cb6fc6f268b8bf210fe846a13542a.tar.bz2 | |
Update base/SConscript to remove Windows only parts from the Linux build.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/SConscript | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/base/SConscript b/base/SConscript index f645697..87966d1 100644 --- a/base/SConscript +++ b/base/SConscript @@ -236,10 +236,11 @@ if env['PLATFORM'] == 'posix': env_tests['LIBS'].remove('libpng') env_tests['LIBS'].remove('zlib') -env_tests.ChromeTestProgram(['debug_message.exe', - 'debug_message.ilk', - 'debug_message.pdb'], - ['debug_message.cc']) +if env['PLATFORM'] == 'win32': + env_tests.ChromeTestProgram(['debug_message.exe', + 'debug_message.ilk', + 'debug_message.pdb'], + ['debug_message.cc']) # These test files work on *all* platforms; tests that don't work # cross-platform live below. @@ -299,6 +300,8 @@ if env['PLATFORM'] == 'win32': 'word_iterator_unittest.cc', ]) +test_targets = [ 'base_unittests' ] + if env['PLATFORM'] == 'win32': # Windows-specific tests. test_files.extend([ @@ -307,14 +310,14 @@ if env['PLATFORM'] == 'win32': 'win_util_unittest.cc', 'wmi_util_unittest.cc', ]) - -base_unittests = env_tests.ChromeTestProgram([ - 'base_unittests', + test_targets.extend([ 'base_unittests.exp', 'base_unittests.ilk', 'base_unittests.lib', - 'base_unittests.pdb'], test_files) + 'base_unittests.pdb', + ]) +base_unittests = env_tests.ChromeTestProgram(test_targets, test_files) # Install up a level to allow unit test path assumptions to be valid. installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) @@ -331,5 +334,7 @@ SConscript(sconscript_dirs, exports=['env']) env.Alias('base', ['.', installed_base_unittests, '../icudt38.dll']) -env_tests.StaticObject('perftimer.cc') -env_tests.StaticObject('run_all_perftests.cc') +# These aren't ported to other platforms yet. +if env['PLATFORM'] == 'win32': + env_tests.StaticObject('perftimer.cc') + env_tests.StaticObject('run_all_perftests.cc') |