summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 19:30:46 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 19:30:46 +0000
commit95d050e357cd2f2a226621dd8639baaf30cad544 (patch)
treea44275da340d48f19a8898c80ac841800ec55141 /webkit
parent697b87dd539e18cf21d5e65a7e55919f615e394c (diff)
downloadchromium_src-95d050e357cd2f2a226621dd8639baaf30cad544.zip
chromium_src-95d050e357cd2f2a226621dd8639baaf30cad544.tar.gz
chromium_src-95d050e357cd2f2a226621dd8639baaf30cad544.tar.bz2
Hack to make tests work if out is a symlink: see if the current dir is the source root.
Fix some tests that were manually getting sourcedir from DIR_EXE instead of using DIR_SOURCE_ROOT. BUG=none TEST=rm -r out, ln -s /somedir/out out, run tests Review URL: http://codereview.chromium.org/192064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 72864e2..87e80a5 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -612,8 +612,8 @@ std::string TestShell::RewriteLocalUrl(const std::string& url) {
std::string new_url(url);
if (url.compare(0, kPrefixLen, kPrefix, kPrefixLen) == 0) {
FilePath replace_path;
- PathService::Get(base::DIR_EXE, &replace_path);
- replace_path = replace_path.DirName().DirName().Append(
+ PathService::Get(base::DIR_SOURCE_ROOT, &replace_path);
+ replace_path = replace_path.Append(
"webkit/data/layout_tests/LayoutTests/");
new_url = std::string("file://") + replace_path.value() +
url.substr(kPrefixLen);