[lldb] Add lldbutil.install_to_target() helper #91944
Merged
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
It can be used in tests llvm#91918, llvm#91931 and such.
|
@llvm/pr-subscribers-lldb Author: Dmitry Vasilyev (slydiman) ChangesIt can be used in tests #91918, #91931 and such. Full diff: https://github.com/llvm/llvm-project/pull/91944.diff 1 Files Affected:
diff --git a/lldb/packages/Python/lldbsuite/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py
index 58eb37fd742d7..e67b68b727b80 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbutil.py
@@ -1654,6 +1654,22 @@ def find_library_callable(test):
)
+def target_install(test, filename):
+ path = test.getBuildArtifact(filename)
+ if lldb.remote_platform:
+ remote_path = lldbutil.append_to_process_working_directory(test, filename)
+ err = lldb.remote_platform.Install(
+ lldb.SBFileSpec(path, True), lldb.SBFileSpec(remote_path, False)
+ )
+ if err.Fail():
+ raise Exception(
+ "remote_platform.Install('%s', '%s') failed: %s"
+ % (path, remote_path, err)
+ )
+ path = remote_path
+ return path
+
+
def read_file_on_target(test, remote):
if lldb.remote_platform:
local = test.getBuildArtifact("file_from_target")
|
labath
reviewed
May 13, 2024
Comment on lines
1658
to
1662
| test.assertTrue(filename or path, "filename or path must be specified.") | ||
| if filename is None: | ||
| filename = os.path.basename(path) | ||
| if path is None: | ||
| path = test.getBuildArtifact(filename) |
There was a problem hiding this comment.
This seems a bit... magical. Can we just have the caller specify a full path to the thing it wants to install? self.getBuildArtifact is not that much extra typing.
There was a problem hiding this comment.
I expected the following usage:
- Use filename (most common usage):
target_path = lldbutil.install_to_target(self, "a.out")
- Use path:
local_path = self.getBuildArtifact("some_file")
# write to local_path here
...
# avoid typing "some_file" constant twice, just extract the filename from the local_path
target_path = lldbutil.install_to_target(self, path=local_path)
- Use both:
# "temp" is the filename on the remote target
target_path = lldbutil.install_to_target(self, "temp", local_temp_path_outside_build_dir)
There was a problem hiding this comment.
Ok. I kept only the full path parameter. Updated. Thanks.
| @@ -1654,6 +1654,26 @@ def find_library_callable(test): | |||
| ) | |||
|
|
|||
|
|
|||
| def target_install(test, filename=None, path=None): | |||
There was a problem hiding this comment.
This is optional, but I think something like install_to_target would be a better match for the naming style of the surrounding functions.
labath
approved these changes
May 14, 2024
slydiman
changed the title
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.
It can be used in tests #91918, #91931 and such.