testing: for CI only, trim PWD from the oslc -M output#1924
Merged
lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom Jan 25, 2025
Merged
testing: for CI only, trim PWD from the oslc -M output#1924lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom
lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom
Conversation
I think this stems from libclang (doing the C preprocessing step for us) giving us relative paths on all platforms but Windows, where it gives absolute paths -- with backslaches and C:\ and all. I'm going to be conservative and not switch to relative paths accross the board on Windows, but for now just restrict it to the builds we do for CI, in order to make the related tests pass for Windows on our CI (where we obviously don't want to have the reference output need to bake in absolute paths of the place they may happen to execute on the GHA runners). Signed-off-by: Larry Gritz <lg@larrygritz.com>
Collaborator
Author
|
ping |
Collaborator
Author
|
No objections for more than a week -> merging |
brechtvl
reviewed
Jan 25, 2025
| continue; // skip pseudo files | ||
| if (dep == filename) | ||
| continue; // skip this file, since we already put it first | ||
| #if defined(_WIN32) && defined(OSL_CI) |
Contributor
There was a problem hiding this comment.
A bit lite, but I'm not sure this actually works right now? There's an OSL_CI environment variable, but no compile definition that I can see.
Collaborator
Author
There was a problem hiding this comment.
Like many such things, it's expressed as ${PROJ_NAME}_CI to preserve a big block of cmake script that I maintain in parallel between OIIO and OSL and this makes it a lot easier to diff and port improvements from one project to the other.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I think this stems from libclang (doing the C preprocessing step for us) giving us relative paths on all platforms but Windows, where it gives absolute paths -- with backslaches and C:\ and all.
I'm going to be conservative and not switch to relative paths accross the board on Windows, but for now just restrict it to the builds we do for CI, in order to make the related tests pass for Windows on our CI (where we obviously don't want to have the reference output need to bake in absolute paths of the place they may happen to execute on the GHA runners).