Merge pull request Ericsson#2060 from dkrupp/isystem_fix

isystem path was wrong
frankfif · Apr 10, 2019 · 22bc17e · 22bc17e
2 parents cb7872e + c4f9a48
commit 22bc17e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/analyzer/codechecker_analyzer/buildlog/log_parser.py b/analyzer/codechecker_analyzer/buildlog/log_parser.py
@@ -328,8 +328,11 @@ def get_compiler_includes(compiler, language, compiler_flags):
         ICI = ImplicitCompilerInfo
         include_dirs = ICI.__filter_compiler_includes(
             ICI.__parse_compiler_includes(ICI.__get_compiler_err(cmd)))
-
-        return ["-isystem " + os.path.normpath(idir) for idir in include_dirs]
+        idirs = []
+        for idir in include_dirs:
+            idirs.append("-isystem")
+            idirs.append(os.path.normpath(idir))
+        return idirs
 
     @staticmethod
     def get_compiler_target(compiler):

diff --git a/analyzer/tests/functional/analyze/test_analyze.py b/analyzer/tests/functional/analyze/test_analyze.py
@@ -150,6 +150,7 @@ def test_compiler_info_files(self):
                 self.assertEquals(len(data), 2)
                 self.assertTrue("clang++" in data)
                 self.assertTrue("g++" in data)
+                self.assertEqual(data["clang++"]["includes"][0], "-isystem")
             except ValueError:
                 self.fail("json.load should successfully parse the file %s"
                           % info_File)