diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 17:07:29 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 17:07:29 +0000 |
| commit | 21697ac3e0beceb79c2db62124ff0b6187b0c132 (patch) | |
| tree | 977eed16c67b4e8e2e6faa727ee645d5ad910c74 /webkit | |
| parent | 67ef2be4c9311dd7acf703effdc214f46a53956a (diff) | |
| download | chromium_src-21697ac3e0beceb79c2db62124ff0b6187b0c132.zip chromium_src-21697ac3e0beceb79c2db62124ff0b6187b0c132.tar.gz chromium_src-21697ac3e0beceb79c2db62124ff0b6187b0c132.tar.bz2 | |
Reverting 8462,8458 since it broke the linux builder.
Review URL: http://codereview.chromium.org/18668
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -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, 1 insertions, 12 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 4ed3023..90291a1 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -230,9 +230,6 @@ test_files = [ 'run_all_tests.cc', 'test_shell_test.cc', 'text_input_controller_unittest.cc', - '$SKIA_DIR/ext/convolver_unittest.cc', - '$SKIA_DIR/ext/platform_canvas_unittest.cc', - '$SKIA_DIR/ext/vector_canvas_unittest.cc', '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', '$WEBKIT_DIR/glue/context_menu_unittest.cc', '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc index 89ed594..b3745fa 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_)) << data_dir_; + ASSERT_TRUE(file_util::PathExists(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 2b0bb22..ff0a6b2 100644 --- a/webkit/tools/test_shell/test_shell_tests.vcproj +++ b/webkit/tools/test_shell/test_shell_tests.vcproj @@ -307,10 +307,6 @@ > </File> <File - RelativePath="..\..\..\skia\ext\convolver_unittest.cc" - > - </File> - <File RelativePath="..\..\glue\cpp_bound_class_unittest.cc" > </File> @@ -343,10 +339,6 @@ > </File> <File - RelativePath="..\..\..\skia\ext\image_operations_unittest.cc" - > - </File> - <File RelativePath=".\keyboard_unittest.cc" > </File> |