Bugfix for gcc-493 #1155
Merged
Bugfix for gcc-493 #1155
Conversation
This file contains 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
Avoids cluttering the test output.
|
678dc1e should be ok to merge. It got a clean check from win-builder (http://win-builder.r-project.org/ZrVV35IPB27C/00check.log) |
| @@ -131,21 +133,53 @@ setup_rtools <- function(cache = TRUE, debug = FALSE) { | |||
| TRUE | |||
| } | |||
|
|
|||
| scan_path_for_rtools <- function(debug = FALSE) { | |||
| scan_path_for_rtools <- function( | |||
| debug = FALSE, | |||
There was a problem hiding this comment.
Can you indent these lines please?
There was a problem hiding this comment.
How much indentation? Just one additional level or to line up with function?
There was a problem hiding this comment.
I like to have arguments line up with the ( in function(
There was a problem hiding this comment.
Great that is what I did 😄!
|
LGTM. Can you add a bullet to NEWS? Let me know once you merge, and I'll release |
|
Ok now merged, can be released whenever you are ready. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 ended up special casing the situation on win-builder as it seems like a reasonable layout to support. The old toolchain installs to
Rtools/gcc-4.6.3so installing the new on toRtools/gcc-4.9.3does make some sense even if it is not the default installation location.This also includes some cleanup, - 1b0fc66 suppresses the output of
create()used in the infrastucture tests so it won't clutter the output.I am mainly opening this as a PR to make sure it is working before merging.