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.

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

Fix a patch conflict in libc++ tests. #477

Merged
merged 1 commit into from
Sep 2, 2024

Conversation

statham-arm
Copy link
Collaborator

One of our xfailed tests has been fixed, and the patch adding the xfail comment was causing a conflict.

One of our xfailed tests has been fixed, and the patch adding the
xfail comment was causing a conflict.
Copy link
Contributor

@DavidSpickett DavidSpickett left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@DavidSpickett
Copy link
Contributor

DavidSpickett commented Sep 2, 2024

Will fix #476.

@DavidSpickett
Copy link
Contributor

And #475.

@statham-arm statham-arm merged commit 7616f8c into ARM-software:main Sep 2, 2024
1 check passed
@statham-arm statham-arm deleted the xfail-conflict branch September 2, 2024 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants