Commit a3e4d146 authored by Sidney San Martín's avatar Sidney San Martín Committed by Commit Bot

Revert "[Vim/YCM] Fix missing system headers when YCM was built with its own libclang."

This reverts commit 75a861f2.

Reason for revert: It turns out this is an upstream issue. See:

- https://chromium-review.googlesource.com/c/chromium/src/+/1482557
- https://github.com/Valloric/ycmd/pull/1193

Original change's description:
> [Vim/YCM] Fix missing system headers when YCM was built with its own libclang.
> 
> Bug: 932667
> Change-Id: I2eb9965da1eb3f9ad4a5ce103cf6e32d35019e48
> Reviewed-on: https://chromium-review.googlesource.com/c/1476105
> Auto-Submit: Sidney San Martín <sdy@chromium.org>
> Commit-Queue: Sidney San Martín <sdy@chromium.org>
> Commit-Queue: Asanka Herath <asanka@chromium.org>
> Reviewed-by: Asanka Herath <asanka@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#632846}

TBR=sdy@chromium.org,asanka@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 932667
Change-Id: I5a684c91723d28470e1d903cd74674ce145b421b
Reviewed-on: https://chromium-review.googlesource.com/c/1483709Reviewed-by: default avatarSidney San Martín <sdy@chromium.org>
Commit-Queue: Sidney San Martín <sdy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634829}
parent f1e50fa5
...@@ -296,13 +296,6 @@ def GetClangOptionsFromNinjaForFilename(chrome_root, filename): ...@@ -296,13 +296,6 @@ def GetClangOptionsFromNinjaForFilename(chrome_root, filename):
# Chromium's includes are relative to that. # Chromium's includes are relative to that.
additional_flags = ['-I' + os.path.join(chrome_root)] additional_flags = ['-I' + os.path.join(chrome_root)]
# Fix missing system headers. For details, see
# <https://github.com/Valloric/YouCompleteMe/issues/303>
clang_root = os.path.join(
chrome_root, 'third_party/llvm-build/Release+Asserts')
additional_flags += ['-isystem', os.path.join(clang_root, 'include')]
additional_flags += ['-isystem', os.path.join(clang_root, 'include/c++/v1')]
# Version of Clang used to compile Chromium can be newer then version of # Version of Clang used to compile Chromium can be newer then version of
# libclang that YCM uses for completion. So it's possible that YCM's libclang # libclang that YCM uses for completion. So it's possible that YCM's libclang
# doesn't know about some used warning options, which causes compilation # doesn't know about some used warning options, which causes compilation
......
...@@ -20,12 +20,6 @@ import sys ...@@ -20,12 +20,6 @@ import sys
import tempfile import tempfile
import unittest import unittest
_common_flags = [
'-I[SRC]',
'-isystem', '[SRC]/third_party/llvm-build/Release+Asserts/include',
'-isystem', '[SRC]/third_party/llvm-build/Release+Asserts/include/c++/v1',
'-Wno-unknown-warning-option'
]
def CreateFile(path, copy_from=None, format_with=None, make_executable=False): def CreateFile(path, copy_from=None, format_with=None, make_executable=False):
"""Creates a file. """Creates a file.
...@@ -169,8 +163,9 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -169,8 +163,9 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.ycm_extra_conf.GetClangOptionsFromNinjaForFilename( self.ycm_extra_conf.GetClangOptionsFromNinjaForFilename(
self.chrome_root, os.path.join(self.chrome_root, 'one.cpp')) self.chrome_root, os.path.join(self.chrome_root, 'one.cpp'))
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(clang_options), _common_flags + [ self.NormalizeStringsInList(clang_options), [
'-I[OUT]/a', '-I[OUT]/tag-one' '-I[SRC]', '-Wno-unknown-warning-option', '-I[OUT]/a',
'-I[OUT]/tag-one'
]) ])
def testOutDirNames(self): def testOutDirNames(self):
...@@ -195,9 +190,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -195,9 +190,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a', '-I[OUT]/tag-one'
'-I[OUT]/a', '-I[OUT]/tag-one'
]) ])
def testGetFlagsForFileForUnknownCppFile(self): def testGetFlagsForFileForUnknownCppFile(self):
...@@ -209,9 +203,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -209,9 +203,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a', '-I[OUT]/tag-default'
'-I[OUT]/a', '-I[OUT]/tag-default'
]) ])
def testGetFlagsForFileForUnknownCppNotTestFile(self): def testGetFlagsForFileForUnknownCppNotTestFile(self):
...@@ -223,9 +216,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -223,9 +216,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a', '-I[OUT]/tag-default'
'-I[OUT]/a', '-I[OUT]/tag-default'
]) ])
testGetFlagsForFileForKnownObjcFile = TestLanguage('eight.m', 'objective-c') testGetFlagsForFileForKnownObjcFile = TestLanguage('eight.m', 'objective-c')
...@@ -249,9 +241,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -249,9 +241,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a', '-I[OUT]/tag-default'
'-I[OUT]/a', '-I[OUT]/tag-default'
]) ])
def testGetFlagsForFileForUnknownUnittestFile(self): def testGetFlagsForFileForUnknownUnittestFile(self):
...@@ -263,9 +254,9 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -263,9 +254,9 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a',
'-I[OUT]/a', '-I[OUT]/tag-default-test' '-I[OUT]/tag-default-test'
]) ])
def testGetFlagsForFileForUnknownBrowsertestFile2(self): def testGetFlagsForFileForUnknownBrowsertestFile2(self):
...@@ -277,9 +268,9 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -277,9 +268,9 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a',
'-I[OUT]/a', '-I[OUT]/tag-default-test' '-I[OUT]/tag-default-test'
]) ])
def testGetFlagsForFileForKnownHeaderFileWithAssociatedCppFile(self): def testGetFlagsForFileForKnownHeaderFileWithAssociatedCppFile(self):
...@@ -291,9 +282,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -291,9 +282,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a', '-I[OUT]/tag-three'
'-I[OUT]/a', '-I[OUT]/tag-three'
]) ])
def testSourceFileWithNonClangOutputs(self): def testSourceFileWithNonClangOutputs(self):
...@@ -319,9 +309,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -319,9 +309,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a', '-I[OUT]/tag-four'
'-I[OUT]/a', '-I[OUT]/tag-four'
]) ])
def testSourceFileWithOnlyNonClangOutputs(self): def testSourceFileWithOnlyNonClangOutputs(self):
...@@ -333,9 +322,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -333,9 +322,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
self.assertTrue('flags' in result) self.assertTrue('flags' in result)
self.assertEquals( self.assertEquals(
self.NormalizeStringsInList(result['flags']), [ self.NormalizeStringsInList(result['flags']), [
'-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++' '-DUSE_CLANG_COMPLETER', '-std=c++14', '-x', 'c++', '-I[SRC]',
] + _common_flags + [ '-Wno-unknown-warning-option', '-I[OUT]/a', '-I[OUT]/tag-default'
'-I[OUT]/a', '-I[OUT]/tag-default'
]) ])
def testGetFlagsForSysrootAbsPath(self): def testGetFlagsForSysrootAbsPath(self):
...@@ -351,7 +339,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -351,7 +339,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
'-std=c++14', '-std=c++14',
'-x', '-x',
'c++', 'c++',
] + _common_flags + [ '-I[SRC]',
'-Wno-unknown-warning-option',
'-I[OUT]/a', '-I[OUT]/a',
'--sysroot=/usr/lib/sysroot-image', '--sysroot=/usr/lib/sysroot-image',
'-isysroot', '-isysroot',
...@@ -371,7 +360,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -371,7 +360,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
'-std=c++14', '-std=c++14',
'-x', '-x',
'c++', 'c++',
] + _common_flags + [ '-I[SRC]',
'-Wno-unknown-warning-option',
'-I[OUT]/a', '-I[OUT]/a',
'--sysroot=[SRC]/build/sysroot-image', '--sysroot=[SRC]/build/sysroot-image',
'-isysroot', '-isysroot',
...@@ -389,7 +379,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -389,7 +379,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
'-std=c++14', '-std=c++14',
'-x', '-x',
'c++', 'c++',
] + _common_flags + [ '-I[SRC]',
'-Wno-unknown-warning-option',
'-I[OUT]/b', '-I[OUT]/b',
'-isystem[OUT]/a', '-isystem[OUT]/a',
'-isystem', '[SRC]/build/c', '-isystem', '[SRC]/build/c',
...@@ -407,7 +398,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase): ...@@ -407,7 +398,8 @@ class Chromium_ycmExtraConfTest(unittest.TestCase):
'-std=c++14', '-std=c++14',
'-x', '-x',
'c++', 'c++',
] + _common_flags + [ '-I[SRC]',
'-Wno-unknown-warning-option',
'-I', '[OUT]/a', '-I', '[OUT]/a',
'-I', '[OUT]/tag-eleven' '-I', '[OUT]/tag-eleven'
]) ])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment