diff options
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py | 12 | ||||
| -rw-r--r-- | lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp | 1 |
2 files changed, 2 insertions, 11 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py b/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py index 96e1446c278..816751cd879 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py @@ -25,22 +25,14 @@ class TestPaths(TestBase): lldb.ePathTypePythonDir, lldb.ePathTypeLLDBSystemPlugins, lldb.ePathTypeLLDBUserPlugins, - lldb.ePathTypeLLDBTempSystemDir] + lldb.ePathTypeLLDBTempSystemDir, + lldb.ePathTypeClangDir] for path_type in dir_path_types: f = lldb.SBHostOS.GetLLDBPath(path_type) # No directory path types should have the filename set self.assertTrue(f.GetFilename() is None) - # TODO: Merge into test_path when GetClangResourceDir is implemented on - # windows - @expectedFailureAll(oslist=["windows"]) - @no_debug_info_test - def test_clang_dir_path(self): - '''Test to make sure clang dir is set correctly''' - clang_dir = lldb.SBHostOS.GetLLDBPath(lldb.ePathTypeClangDir) - self.assertFalse(clang_dir.GetDirectory() is None) - @no_debug_info_test def test_directory_doesnt_end_with_slash(self): current_directory_spec = lldb.SBFileSpec(os.path.curdir) diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp index ce0b630225f..392baecb305 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp @@ -54,7 +54,6 @@ static bool DefaultComputeClangResourceDirectory(FileSpec &lldb_shlib_spec, llvm::sys::path::append(clang_dir, relative_path); if (!verify || VerifyClangPath(clang_dir)) { file_spec.GetDirectory().SetString(clang_dir); - FileSystem::Instance().Resolve(file_spec); return true; } |
