summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 17:03:17 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 17:03:17 +0000
commit5b70a408db8eb6fc691f28eca73630bced0b5e31 (patch)
tree2e06a4678e8dd6dcc8b1c984ff65850212b29bc7 /webkit
parentc5b3c88872ec8e912c687b333b381e3b9836ddbb (diff)
downloadchromium_src-5b70a408db8eb6fc691f28eca73630bced0b5e31.zip
chromium_src-5b70a408db8eb6fc691f28eca73630bced0b5e31.tar.gz
chromium_src-5b70a408db8eb6fc691f28eca73630bced0b5e31.tar.bz2
Fix plugin tests on linux.
Since the file is hard linked during a build step, during test setup, the CopyDirectory command fails because it can't copy from the same hard linked file. TBR=evanm Review URL: http://codereview.chromium.org/3091013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/plugin_tests.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index 81903ac..aed5dc5 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -54,6 +54,9 @@ class PluginTest : public TestShellTest {
}
void CopyTestPlugin() {
+ // On Linux, we need to delete before copying because if the plugin is a
+ // hard link, the copy will fail.
+ DeleteTestPlugin();
ASSERT_TRUE(file_util::CopyDirectory(plugin_src_, plugin_file_path_, true));
}