diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 19:45:07 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 19:45:07 +0000 |
commit | b880b1feb398ed0de47d355a0ee330c1f4cb89a8 (patch) | |
tree | c5c16264eb7df852b35c4058da39e1a46ad91f49 /base/SConscript | |
parent | 6e93e526a35e8001a0ec46cc60e9230863be289c (diff) | |
download | chromium_src-b880b1feb398ed0de47d355a0ee330c1f4cb89a8.zip chromium_src-b880b1feb398ed0de47d355a0ee330c1f4cb89a8.tar.gz chromium_src-b880b1feb398ed0de47d355a0ee330c1f4cb89a8.tar.bz2 |
Add skia and our png wrappers. png_codec_unittest and image_operations_unittest pass. This gives us 70 passing unittests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/SConscript')
-rw-r--r-- | base/SConscript | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/base/SConscript b/base/SConscript index 228e884..719b019 100644 --- a/base/SConscript +++ b/base/SConscript @@ -227,12 +227,6 @@ if env['PLATFORM'] == 'win32': ], ) -if env['PLATFORM'] == 'posix': - # Remove the libraries that don't build yet under Linux. - env_tests['LIBS'].remove('skia') - env_tests['LIBS'].remove('libpng') - env_tests['LIBS'].remove('zlib') - # These test files work on *all* platforms; tests that don't work # cross-platform live below. test_files = [ @@ -254,6 +248,8 @@ test_files = [ 'values_unittest.cc', 'waitable_event_unittest.cc', 'gfx/convolver_unittest.cc', + 'gfx/image_operations_unittest.cc', + 'gfx/png_codec_unittest.cc', 'gfx/rect_unittest.cc', ] @@ -284,10 +280,8 @@ if env['PLATFORM'] == 'win32': 'timer_unittest.cc', 'tracked_objects_test.cc', 'word_iterator_unittest.cc', - 'gfx/image_operations_unittest.cc', 'gfx/native_theme_unittest.cc', 'gfx/platform_canvas_unittest.cc', - 'gfx/png_codec_unittest.cc', 'gfx/uniscribe_unittest.cc', 'gfx/vector_canvas_unittest.cc', ]) |