[lldb] Fixed the TestCompletion test running on a remote target #92281
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Install the image to the remote target if necessary. Platform::LoadImage() uses the following logic before DoLoadImage()
```
if (IsRemote() || local_file != remote_file) {
error = Install(local_file, remote_file);
...
}
```
The FileSpec for the local path may be resolved, so it is necessary to use the condition `if lldb.remote_platform:`.
|
@llvm/pr-subscribers-lldb Author: Dmitry Vasilyev (slydiman) ChangesInstall the image to the remote target if necessary. Platform::LoadImage() uses the following logic before DoLoadImage() The FileSpec for the local path may be resolved, so it is necessary to use the condition Full diff: https://github.com/llvm/llvm-project/pull/92281.diff 1 Files Affected:
diff --git a/lldb/test/API/functionalities/completion/TestCompletion.py b/lldb/test/API/functionalities/completion/TestCompletion.py
index 0d6907e0c3d22..9959c7363aa2b 100644
--- a/lldb/test/API/functionalities/completion/TestCompletion.py
+++ b/lldb/test/API/functionalities/completion/TestCompletion.py
@@ -107,9 +107,20 @@ def test_process_unload(self):
self, "// Break here", lldb.SBFileSpec("main.cpp")
)
err = lldb.SBError()
- self.process().LoadImage(
- lldb.SBFileSpec(self.getBuildArtifact("libshared.so")), err
- )
+ if lldb.remote_platform:
+ self.process().LoadImage(
+ lldb.SBFileSpec(self.getBuildArtifact("libshared.so")),
+ lldb.SBFileSpec(
+ lldbutil.append_to_process_working_directory(self, "libshared.so"),
+ False,
+ ),
+ err,
+ )
+ else:
+ self.process().LoadImage(
+ lldb.SBFileSpec(self.getBuildArtifact("libshared.so")),
+ err,
+ )
self.assertSuccess(err)
self.complete_from_to("process unload ", "process unload 0")
|
Comment on lines
110
to
123
| if lldb.remote_platform: | ||
| self.process().LoadImage( | ||
| lldb.SBFileSpec(self.getBuildArtifact("libshared.so")), | ||
| lldb.SBFileSpec( | ||
| lldbutil.append_to_process_working_directory(self, "libshared.so"), | ||
| False, | ||
| ), | ||
| err, | ||
| ) | ||
| else: | ||
| self.process().LoadImage( | ||
| lldb.SBFileSpec(self.getBuildArtifact("libshared.so")), | ||
| err, | ||
| ) |
There was a problem hiding this comment.
I think this can be simplified to:
err = lldb.SBError()
local_spec = lldb.SBFileSpec(self.getBuildArtifact("libshared.so"))
remote_spec = lldb.SBFileSpec(lldbutil.append_to_process_working_directory(self, "libshared.so"), false) if lldb.remote_platform else lldb.SBFileSpec()
self.process().LoadImage(local_spec, remote_spec)
There was a problem hiding this comment.
I have updated the patch. Thanks.
There was a problem hiding this comment.
Unfortunately, this ends up modifying the source tree. I'm going to revert this back to the intermediate version.
labath
added a commit
that referenced
this pull request
May 17, 2024
This was a side-effect of the "optimization" in #92281. Deoptimize the code slightly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Install the image to the remote target if necessary. Platform::LoadImage() uses the following logic before DoLoadImage()
The FileSpec for the local path may be resolved, so it is necessary to use the condition
if lldb.remote_platform:.