Skip to content

Commit

Permalink
[lldb] Fix API test for file redirection to existing files (#114119)
Browse files Browse the repository at this point in the history
API test failed for remote platform in
[#112657](#112657)

Previously when putting files onto remote platform, I used `platform
file write -d <data>` which actually required a `platform file open
<path>` first in order to obtain a file descriptor.
eg. in file
[TestGDBRemotePlatformFile.py](https://github.com/llvm/llvm-project/blob/94e7d9c0bfe517507ea08b00fb00c32fb2837a82/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py#L24-L32)
To fix this, use the `platform put-file` method, which is used in the
`redirect_stdin` from this test already.
  • Loading branch information
kusmour authored Oct 30, 2024
1 parent bfe486f commit f7c36d2
Showing 1 changed file with 23 additions and 16 deletions.
39 changes: 23 additions & 16 deletions lldb/test/API/python_api/process/io/TestProcessIO.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,31 +99,38 @@ def test_stdout_stderr_redirection(self):
@expectedFlakeyLinux(bugnumber="llvm.org/pr26437")
@skipIfDarwinEmbedded # debugserver can't create/write files on the device
def test_stdout_stderr_redirection_to_existing_files(self):
"""Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT and STDERR without redirecting STDIN to output files already exist."""
"""Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT and STDERR redirect to output files already exist."""
self.setup_test()
self.build()
self.create_target()
self.write_file_with_placeholder(self.output_file)
self.write_file_with_placeholder(self.error_file)
self.redirect_stdout()
self.redirect_stderr()
self.run_process(True)
output = self.read_output_file_and_delete()
error = self.read_error_file_and_delete()
self.check_process_output(output, error)

def write_file_with_placeholder(self, target_file):
# Create the output and error files with placeholder
placeholder = "This content should be overwritten."
# Local file directory and working directory are the same for local debugging
f = open(self.local_output_file, "w")
f.write(placeholder)
f.close()
f = open(self.local_error_file, "w")
f.write(placeholder)
f.close()
if lldb.remote_platform:
self.runCmd(
'platform file write "{target}" -d "{data}"'.format(
target=target_file, data=placeholder
'platform put-file "{local}" "{remote}"'.format(
local=self.local_output_file, remote=self.output_file
)
)
self.runCmd(
'platform put-file "{local}" "{remote}"'.format(
local=self.local_error_file, remote=self.error_file
)
)
else:
f = open(target_file, "w")
f.write(placeholder)
f.close()

self.redirect_stdout()
self.redirect_stderr()
self.run_process(True)
output = self.read_output_file_and_delete()
error = self.read_error_file_and_delete()
self.check_process_output(output, error)

# target_file - path on local file system or remote file system if running remote
# local_file - path on local system
Expand Down

0 comments on commit f7c36d2

Please sign in to comment.