diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 20:10:48 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 20:10:48 +0000 |
| commit | 5bfafb06880152214274bb43ee82dd1ea2edfdb2 (patch) | |
| tree | ec9b49d2ec194ee612e1cd2370c31d05f6752f80 /webkit/tools/test_shell | |
| parent | 19cbbd980d6c206782f3c4ea7ed9b1a730a91895 (diff) | |
| download | chromium_src-5bfafb06880152214274bb43ee82dd1ea2edfdb2.zip chromium_src-5bfafb06880152214274bb43ee82dd1ea2edfdb2.tar.gz chromium_src-5bfafb06880152214274bb43ee82dd1ea2edfdb2.tar.bz2 | |
Add back convolver_unittest.cc and image_operations_unittest.cc.
Fix a TODO in platform_canvas_unittest.cc.
Make vector_canvas_unittest.cc slightly less dependent on base/.
Remove Windows 2000 checks.
(Same as r8458 with platform_canvas_unittest.cc and SConscript fixed)
BUG=5113
Review URL: http://codereview.chromium.org/18511
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/image_decoder_unittest.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_tests.vcproj | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 90291a1..fd13332 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -230,6 +230,7 @@ test_files = [ 'run_all_tests.cc', 'test_shell_test.cc', 'text_input_controller_unittest.cc', + '$SKIA_DIR/ext/convolver_unittest.cc', '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', '$WEBKIT_DIR/glue/context_menu_unittest.cc', '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', @@ -254,9 +255,11 @@ test_files = [ if env.Bit('windows'): # TODO(port): put portable files in above test_files declaration. test_files.extend([ + '$SKIA_DIR/ext/platform_canvas_unittest.cc', 'plugin_tests.cc', # Commented out until a regression is fixed and this file is restored. #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', + '$SKIA_DIR/ext/vector_canvas_unittest.cc', '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', '$WEBKIT_DIR/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp', ]) diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc index b3745fa..89ed594 100644 --- a/webkit/tools/test_shell/image_decoder_unittest.cc +++ b/webkit/tools/test_shell/image_decoder_unittest.cc @@ -82,7 +82,7 @@ void ImageDecoderTest::SetUp() { file_util::AppendToPath(&data_dir_, L"webkit"); file_util::AppendToPath(&data_dir_, L"data"); file_util::AppendToPath(&data_dir_, format_ + L"_decoder"); - ASSERT_TRUE(file_util::PathExists(data_dir_)); + ASSERT_TRUE(file_util::PathExists(data_dir_)) << data_dir_; } std::vector<std::wstring> ImageDecoderTest::GetImageFiles() const { diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj index ff0a6b2..2b0bb22 100644 --- a/webkit/tools/test_shell/test_shell_tests.vcproj +++ b/webkit/tools/test_shell/test_shell_tests.vcproj @@ -307,6 +307,10 @@ > </File> <File + RelativePath="..\..\..\skia\ext\convolver_unittest.cc" + > + </File> + <File RelativePath="..\..\glue\cpp_bound_class_unittest.cc" > </File> @@ -339,6 +343,10 @@ > </File> <File + RelativePath="..\..\..\skia\ext\image_operations_unittest.cc" + > + </File> + <File RelativePath=".\keyboard_unittest.cc" > </File> |