Skip to content

Update run_fvp and run_qemu scripts, to capture and return the stdout and stderr to the calling function. #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: arm-software
Choose a base branch
from
Open

Update run_fvp and run_qemu scripts, to capture and return the stdout and stderr to the calling function. #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arm-software/embedded/arm-runtimes/test-support/lit-exec-fvp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def main():
help="optional arguments for the image",
)
args = parser.parse_args()
ret_code = run_fvp(
ret_code, data, err = run_fvp(
args.fvp_install_dir,
args.fvp_config_dir,
args.fvp_model,
Expand Down
2 changes: 1 addition & 1 deletion arm-software/embedded/arm-runtimes/test-support/lit-exec-qemu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def main():
help="optional arguments for the image",
)
args = parser.parse_args()
ret_code = run_qemu(
ret_code, data, err = run_qemu(
args.qemu_command,
args.qemu_machine,
args.qemu_cpu,
Expand Down
2 changes: 1 addition & 1 deletion arm-software/embedded/arm-runtimes/test-support/picolibc-test-wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def main():
help="optional arguments for the image",
)
args = parser.parse_args()
ret_code = run(args)
ret_code, data, err = run(args)
sys.exit(ret_code)


Expand Down
2 changes: 1 addition & 1 deletion arm-software/embedded/arm-runtimes/test-support/run_fvp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@ def run_fvp(
result_stdout = result.stdout

sys.stdout.buffer.write(result_stdout)
return result.returncode
return result.returncode, result.stdout.decode(), result.stderr.decode() if result.stderr != None else ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this kind of situation it's a good idea to add the errors='replace' argument to the decode calls. Then any bytes that aren't legal UTF-8 will be turned into a Unicode replacement character � instead of causing an exception.

If the program under test does emit invalid UTF-8, we still want to see in the log file what it was, so that we can get a clue about what went wrong. A Python exception that stops the script from showing us the useful detail isn't good for anyone.

2 changes: 1 addition & 1 deletion arm-software/embedded/arm-runtimes/test-support/run_qemu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ def run_qemu(
check=False,
)
sys.stdout.buffer.write(result.stdout)
return result.returncode
return result.returncode, result.stdout.decode(), result.stderr.decode() if result.stderr != None else ""