https://github.com/kusmour updated
https://github.com/llvm/llvm-project/pull/114119
>From a1b19dfcce99cfbfea5a3e7004e1a04e0b13a3e2 Mon Sep 17 00:00:00 2001
From: Wanyi Ye <wa...@meta.com>
Date: Tue, 29 Oct 2024 12:50:28 -0700
Subject: [PATCH] [lldb] Fix API test for file redirection to existing files
---
.../python_api/process/io/TestProcessIO.py | 39 +++++++++++--------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/lldb/test/API/python_api/process/io/TestProcessIO.py
b/lldb/test/API/python_api/process/io/TestProcessIO.py
index 3b5c7c48c51f4d..5d9727add399b5 100644
--- a/lldb/test/API/python_api/process/io/TestProcessIO.py
+++ b/lldb/test/API/python_api/process/io/TestProcessIO.py
@@ -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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
