Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(884)

Unified Diff: tools/vim/chromium.ycm_extra_conf.py

Issue 2303813002: Fix the YCM tests on Mac. (Closed)
Patch Set: The proper^2 fix is actually to remove all uses of realpath Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/vim/ninja_output.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/vim/chromium.ycm_extra_conf.py
diff --git a/tools/vim/chromium.ycm_extra_conf.py b/tools/vim/chromium.ycm_extra_conf.py
index e9397ce25420ce40e68f3e21ecb48cd94107a866..0db23070032748e7a09c24879f04cca83c70867a 100644
--- a/tools/vim/chromium.ycm_extra_conf.py
+++ b/tools/vim/chromium.ycm_extra_conf.py
@@ -80,7 +80,7 @@ def FindChromeSrcFromFilename(filename):
(String) Path of 'src/', or None if unable to find.
"""
curdir = os.path.normpath(os.path.dirname(filename))
- while not (os.path.basename(os.path.realpath(curdir)) == 'src'
+ while not (os.path.basename(curdir) == 'src'
and PathExists(curdir, 'DEPS')
and (PathExists(curdir, '..', '.gclient')
or PathExists(curdir, '.git'))):
@@ -159,7 +159,7 @@ def GetNinjaBuildOutputsForSourceFile(out_dir, filename):
"""
# Ninja needs the path to the source file relative to the output build
# directory.
- rel_filename = os.path.relpath(os.path.realpath(filename), out_dir)
+ rel_filename = os.path.relpath(filename, out_dir)
p = subprocess.Popen(['ninja', '-C', out_dir, '-t', 'query', rel_filename],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
@@ -320,7 +320,7 @@ def GetClangOptionsFromNinjaForFilename(chrome_root, filename):
sys.path.append(os.path.join(chrome_root, 'tools', 'vim'))
from ninja_output import GetNinjaOutputDirectory
- out_dir = os.path.realpath(GetNinjaOutputDirectory(chrome_root))
+ out_dir = GetNinjaOutputDirectory(chrome_root)
clang_line = GetClangCommandLineFromNinjaForSource(
out_dir, GetBuildableSourceFile(chrome_root, filename))
« no previous file with comments | « no previous file | tools/vim/ninja_output.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698