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

Fixes for macOS #28

Merged
merged 4 commits into from Mar 17, 2018
Merged

Conversation

jakirkham
Copy link
Member

Patches out some broken tests on macOS that are known to fail upstream. The fix for these failures are pending. Also adjusts the new recipe tests to be compatible or skipped (e.g. ldd) as appropriate on macOS. Fixes a linkage issue with libssh2 that was causing the build to break locally.

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

Needed to actually get the linkages to libssh2 right. Otherwise it fails
when trying to load dependent libraries.
The new recipe tests included things like hard coding `.so` and using
`ldd` on macOS, which can't possibly work. This tidies those tests up to
work (or be skipped) on macOS as appropriate while still working on
Linux.
The 2056 and 2057 tests fail on macOS and are known to fail upstream.
For now just patch them out so the build can proceed without them.
Some compiler flags changed on Linux, but doubt that has any real
effect. Since macOS failed to deploy anyways there is no conflict with
build number 0. Still, to be cautious, bump the build number to 1.
# #
# xref: https://github.com/curl/curl/issues/2394 #
###################################################
- drop_failing_tests_macos.diff # [osx]
Copy link
Member Author

Choose a reason for hiding this comment

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

@jakirkham jakirkham merged commit 4fdf6b6 into conda-forge:master Mar 17, 2018
@jakirkham jakirkham deleted the fixes_macos branch March 17, 2018 03:00
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.

None yet

2 participants