Skip to content

fix SR-1109: don't use the clang resource override dir for glibc #2279

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
Apr 23, 2016
Merged

fix SR-1109: don't use the clang resource override dir for glibc #2279

merged 1 commit into from
Apr 23, 2016

Conversation

tfiala
Copy link
Contributor

@tfiala tfiala commented Apr 22, 2016

Fixes SR-1109.

Reviewed by: Jordan Rose

We were using the clang resource override dir in a place where it shouldn't be used. LLDB (and thus the REPL) is the only consumer of this feature. It is meant for clang modules.

@tfiala
Copy link
Contributor Author

tfiala commented Apr 22, 2016

@swift-ci Please test

@tfiala
Copy link
Contributor Author

tfiala commented Apr 23, 2016

Okay, we're now hitting a bunch of errors in the LLDB suite, so this isn't quite right yet.

@tfiala
Copy link
Contributor Author

tfiala commented Apr 23, 2016

The LLDB REPL test failures go away if we use the package-layout LLDB for the LLDB executable, but the LLDB REPL tests fail with the in-build-tree layout that used to work.

We hit asserts on many other Swift tests in the test suite regardless of the layout of the binaries. I'll be looking into those.

@tfiala
Copy link
Contributor Author

tfiala commented Apr 23, 2016

I just put in a dependent LLDB change here:
apple/swift-lldb@ea2a5f2

This fixes an issue where Swift modules were not necessarily setting their resource dir. The fix for this PR unmasks that we were in this scenario, which would have caused asserts in the LLDB test suite without addressing the underlying cause first.

@tfiala
Copy link
Contributor Author

tfiala commented Apr 23, 2016

@swift-ci Please test Linux platform

@tfiala
Copy link
Contributor Author

tfiala commented Apr 23, 2016

The only failure in the build on Linux was the integration test that I previously XFAILed because we didn't have this change in. There is no way to change that without breaking something temporarily (i.e. if I check in the integration test first, then they will fail until this goes in; similarly, if I check this in, the packaging will fail on the unexpected success as it did in this check here).

I'll adjust the integration test first and restart the CI if it beats me to this PR submission here.

tfiala added a commit to swiftlang/swift-integration-tests that referenced this pull request Apr 23, 2016
This is needed to get a clean bill of health on:
swiftlang/swift#2279
@tfiala
Copy link
Contributor Author

tfiala commented Apr 23, 2016

@swift-ci Please test Linux platform

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.

1 participant