diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 17:34:03 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-13 17:34:03 +0000 |
| commit | 0614bf728fc59a94ca16f669b575e3a126f13774 (patch) | |
| tree | 89d5ef71213d8f470a8583efa29797c35dc353a2 /base/SConscript | |
| parent | 18b2ad94ce8deae8989212cda8e21ef5215f165b (diff) | |
| download | chromium_src-0614bf728fc59a94ca16f669b575e3a126f13774.zip chromium_src-0614bf728fc59a94ca16f669b575e3a126f13774.tar.gz chromium_src-0614bf728fc59a94ca16f669b575e3a126f13774.tar.bz2 | |
Disable build targets in base/SConscript that don't work on
linux. This lets 'hammer base' build cleanly for me.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/SConscript')
| -rw-r--r-- | base/SConscript | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/base/SConscript b/base/SConscript index c38d1fb..30ac65a 100644 --- a/base/SConscript +++ b/base/SConscript @@ -187,10 +187,10 @@ env_tests.Prepend( LIBS = [ 'base', 'base_gfx', - 'skia', - 'libpng', 'gtest', 'icuuc', + 'libpng', + 'skia', 'zlib', ] ) @@ -233,12 +233,6 @@ if env['PLATFORM'] == 'posix': env_tests['LIBS'].remove('libpng') env_tests['LIBS'].remove('zlib') -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. test_files = [ @@ -262,6 +256,11 @@ test_files = [ if env['PLATFORM'] == 'win32': # These tests aren't really Windows-specific, they're just here until # we have the port versions working. + env_tests.ChromeTestProgram(['debug_message.exe', + 'debug_message.ilk', + 'debug_message.pdb'], + ['debug_message.cc']) + test_files.extend([ 'clipboard_unittest.cc', 'command_line_unittest.cc', |