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

[tests] Checkout sdf and usda files with LF for cross-platform unit testing. #848

Merged

Conversation

asluk
Copy link
Collaborator

@asluk asluk commented May 10, 2019

Description of Change(s)

Ensures that sdf and usda test inputs and baselines use LF on all platforms; otherwise testSdfParsing* and testUsdFlatten* fail on Windows.

Fixes Issue(s)

@asluk asluk changed the base branch from master to dev May 10, 2019 17:31
@spiffmon
Copy link
Member

Hey @asluk - from the changelog, it looks like you may need to rebase your change?

@spiffmon
Copy link
Member

Looks like you already did it - thanks!

@meshula
Copy link
Member

meshula commented May 12, 2019

Is the LF (no CRLF) requirement documented (I can't find it)? If not, it would be nice to make a note in the FAQ, in addition to this fix. (https://graphics.pixar.com/usd/docs/USD-Frequently-Asked-Questions.html)

@jtran56
Copy link

jtran56 commented May 17, 2019

Filed as internal issue #USD-5285.

@asluk
Copy link
Collaborator Author

asluk commented Jul 24, 2019

I don't think the LF requirement is documented anywhere, but the source of it is in the explicit "\n" writes here https://github.com/PixarAnimationStudios/USD/blob/dev/pxr/usd/lib/sdf/textFileFormat.cpp#L192

@spitzak
Copy link

spitzak commented Jul 24, 2019 via email

@meshula
Copy link
Member

meshula commented Jul 24, 2019

+1 on modifying .gitattributes in this way to ensure LF when git cloning.

…ecked out with LF for cross-platform consistency.
@asluk
Copy link
Collaborator Author

asluk commented Mar 14, 2020

Hi all, this would be a nice one to get into 20.05, as it gets all tests passing on Windows. Thanks!

@pixar-oss pixar-oss merged commit 6066c4a into PixarAnimationStudios:dev Mar 20, 2020
@asluk asluk deleted the usda-baselines-lf branch March 21, 2020 10:29
@spitzak
Copy link

spitzak commented Mar 21, 2020

^M should be considered a whitespace character in usda.

Code on one platform should not add whitespace to the end of every line, as it makes unnecessary differences between files written on different platforms. There is very little software left on Windows that cannot deal with just ^J as a newline.

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.

8 participants