diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py | 2 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py index 4385304c88b..29778aad95a 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py @@ -48,6 +48,8 @@ class CompDirSymLinkTestCase(TestBase): "settings set %s %s" % (_COMP_DIR_SYM_LINK_PROP, pwd_symlink)) src_path = self.getBuildArtifact(_SRC_FILE) + # /proc/self/cwd points to a realpath form of current directory. + src_path = os.path.realpath(src_path) lldbutil.run_break_set_by_file_and_line(self, src_path, self.line) @skipIf(hostoslist=["windows"]) diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py index ea822decdb6..2ee691621c7 100644 --- a/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py +++ b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py @@ -158,12 +158,15 @@ class SourceManagerTestCase(TestBase): error=True, substrs=['''error: the replacement path doesn't exist: "/q/r/s/t/u"''']) + # 'make -C' has resolved current directory to its realpath form. + builddir_real = os.path.realpath(self.getBuildDir()) + hidden_real = os.path.realpath(hidden) # Set target.source-map settings. self.runCmd("settings set target.source-map %s %s" % - (self.getBuildDir(), hidden)) + (builddir_real, hidden_real)) # And verify that the settings work. self.expect("settings show target.source-map", - substrs=[self.getBuildDir(), hidden]) + substrs=[builddir_real, hidden_real]) # Display main() and verify that the source mapping has been kicked in. self.expect("source list -n main", SOURCE_DISPLAYED_CORRECTLY, @@ -238,11 +241,14 @@ class SourceManagerTestCase(TestBase): self.build() hidden = self.getBuildArtifact("hidden") lldbutil.mkdir_p(hidden) + # 'make -C' has resolved current directory to its realpath form. + builddir_real = os.path.realpath(self.getBuildDir()) + hidden_real = os.path.realpath(hidden) self.runCmd("settings set target.source-map %s %s" % - (self.getBuildDir(), hidden)) + (builddir_real, hidden_real)) exe = self.getBuildArtifact("a.out") - main = os.path.join(self.getBuildDir(), "hidden", "main-copy.c") + main = os.path.join(builddir_real, "hidden", "main-copy.c") self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) lldbutil.run_break_set_by_file_and_line( |
