Skip to content
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

Jump to bottom

Fix the xml path separator for ps4/5 #1868

Closed
wants to merge 1 commit into from
Closed

Fix the xml path separator for ps4/5 #1868

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
8 changes: 7 additions & 1 deletion starboard/tools/testing/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,13 @@ def MakeLauncher():
# The filename is used by MH to deduce the target name.
xml_filename = f"{target_name}_testoutput.xml"
if out_path:
test_result_xml_path = os.path.join(out_path, xml_filename)
if self.platform in ["ps4", "ps5"]:
Copy link
Contributor

Choose a reason for hiding this comment

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

Would be nice to just include all the windows platforms anyway, but maybe the xb1 platforms are being deploy from linux so not sure how applicable this request is. I think NX is fine here too, but we can skip win32 and xb1.

# The path separator used on ps4/5 is / but this script will be
# running on windows where \ is used.
path_sep = "/"
else:
path_sep = os.path.sep
test_result_xml_path = path_sep.join([out_path, xml_filename])
else:
test_result_xml_path = xml_filename
test_params.append(f"--gtest_output=xml:{test_result_xml_path}")
Expand Down