Skip to content

Adjust clang's multilib flags test to cope with missing variant #504

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

Merged
merged 1 commit into from
Oct 3, 2024

Conversation

pratlucas
Copy link
Collaborator

The clang driver's print-multi-selection-flags.c test uses a
combination of command line options in one of its RUN lines for which we
don't have a valid library variant available.
Since the merging of PR #500, this combination of options now trigger an
error to inform the user of an unsupported setup, but this error also
causes the test to fail.
This adds a new patch file for llvm-project to adjust the test
accordingly.

The clang driver's `print-multi-selection-flags.c` test uses a
combination of command line options in one of its RUN lines for which we
don't have a valid library variant available.
Since the merging of PR ARM-software#500, this combination of options now trigger an
error to inform the user of an unsupported setup, but this error also
causes the test to fail.
This adds a new patch file for llvm-project to adjust the test
accordingly.
@ostannard
Copy link
Collaborator

Would it instead be possible to fix the test upstream to avoid using our multilib.yaml at all? There are other tests, e.g. baremetal-multilib.yaml, which do that by building a directory tree containing symlinks to the compiler and multilib.yaml under test, and some dummy library files. It might be cleaner for this test to add a driver option to use a different multilib.yaml, but I suppose the other tests need that whole tree including the libraries, so that might not be worth it.

@pratlucas
Copy link
Collaborator Author

The change to upstream is under review, but it's taking a while to progress. Should we go ahead with this change for now and revert it once the upstream PR gets merged?

Copy link
Collaborator

@ostannard ostannard left a comment

Choose a reason for hiding this comment

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

LGTM as a temporary workaround.

@pratlucas pratlucas merged commit 8a7f8cc into ARM-software:main Oct 3, 2024
1 check passed
@pratlucas pratlucas deleted the multilib-test-update branch October 3, 2024 12:46
pratlucas added a commit that referenced this pull request Oct 7, 2024
pratlucas added a commit that referenced this pull request Oct 7, 2024
…nt" (#527)

Reverts #504.

The upstream change from llvm/llvm-project#109640 has now been merged,
allowing tests to specify multilib yaml file using a new command line
option. The relevant tests have been updated by that change, so the
downstream adjustment is no longer needed.
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