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

Fix test 4270 #4402

Merged
merged 8 commits into from Nov 19, 2018
Merged

Fix test 4270 #4402

merged 8 commits into from Nov 19, 2018

Conversation

@qrilka
Copy link
Contributor

@qrilka qrilka commented Nov 16, 2018

Please include the following checklist in your PR:

  • Any changes that could be relevant to users have been recorded in the ChangeLog.md
  • The documentation has been updated, if necessary.

This is a fix for a test 4270-files-order, the main point of it is in af36e04 other commits improve Stack integration tests a bit.
Integration tests succeed locally.

Copy link
Contributor

@snoyberg snoyberg left a comment

Can you also include a changelog entry explaining the bug fix this is accomplishing?

src/Stack/Package.hs Outdated Show resolved Hide resolved
@qrilka
Copy link
Contributor Author

@qrilka qrilka commented Nov 19, 2018

Fixed, added changelog

ChangeLog.md Outdated
@@ -97,6 +97,8 @@ Bug fixes:
[#4314](https://github.com/commercialhaskell/stack/pull/4314)
* Add `--cabal-files` flag to `stack ide targets` command.
* Don't download ghc when using `stack clean`.
* Support loading in GHCi definitions from symlinked C files. See
Copy link
Contributor

@snoyberg snoyberg Nov 19, 2018

Suggested change
* Support loading in GHCi definitions from symlinked C files. See
* Support loading in GHCi definitions from symlinked C files. Without this patch, Stack will try to find object files in the directory pointed to by symlinks, while GCC will produce the object files in the original directory. See

return $ if exists then [p] else []
resolveCandidate dir = fmap maybeToList . resolveDirFile dir

resolveDirFile
Copy link
Contributor

@snoyberg snoyberg Nov 19, 2018

Please add a comment explaining that symlinks will not be followed.

@qrilka
Copy link
Contributor Author

@qrilka qrilka commented Nov 19, 2018

Anything else here?

@snoyberg
Copy link
Contributor

@snoyberg snoyberg commented Nov 19, 2018

Good to merge after CI runs

@snoyberg snoyberg merged commit 042d4c1 into master Nov 19, 2018
2 of 5 checks passed
@snoyberg snoyberg deleted the fix-test-4270 branch Nov 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants