C Plugin: Expand GCC data & only shellout to gcc if Xcode is installed on macOS #944
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
If darwin is found: 1. shell out to /usr/bin/xcode-select -p 2a. If it returns an exit code other than 0, assume xcode command line tools are not installed and do not run these commands. 2b. If it returns an exit code of 0, run the commands. Signed-off-by: Erik Gomez <[email protected]>
Signed-off-by: Erik Gomez <[email protected]>
Signed-off-by: Erik Gomez <[email protected]>
Signed-off-by: Erik Gomez <[email protected]>
Signed-off-by: Erik Gomez <[email protected]>
cl / devenv are windows only so avoid checking those on *nix HP UX things should only get checked on HPUX
We’re only collecting this data on Windows now so don’t bother checking if we’re on Windows again
CC is clang on Darwin and the output is different so this just fails every time. We *should* add clang checks at some point though.
None of the values were being populated with the refactoring. Also gcc
hadn’t been collecting anything for a while. This gives us real data
for gcc:
"c": {
"gcc": {
"configured_with":
"--prefix=/Applications/Xcode.app/Contents/Developer/usr
--with-gxx-include-dir=/usr/include/c++/4.2.1",
"description": "Apple LLVM version 8.0.0 (clang-800.0.42.1)",
"version": "8.0.0",
"target": "x86_64-apple-darwin16.3.0",
"thread_model": "posix"
}
},
Add specs for checking that xcode exists on darwin Remove the odd double glibc mess Don't do ruby logic in the expects. That defeats the entire purpose of the specs if we're doing the same faulty logic. Just include the expected string Signed-off-by: Tim Smith <[email protected]>
tas50
changed the title
|
Awesome job @tas50. Looks like the CI is failing, but not due to the PR. I don't want to speak for too many people, but both @natewalck and I would love to see this merged into the next chef release. |
Signed-off-by: Tim Smith <[email protected]>
thommay
reviewed
Jan 23, 2017
| collect_gcc | ||
| collect_glibc | ||
| collect_xlc | ||
| collect_cc |
There was a problem hiding this comment.
collect_cc is pretty badly named here, and is solaris specific.
thommay
reviewed
Jan 23, 2017
| @c = Mash.new | ||
| collect_gcc | ||
| collect_glibc | ||
| collect_xlc |
There was a problem hiding this comment.
believe this is AIX specific.
Signed-off-by: Tim Smith <[email protected]>
thommay
approved these changes
Jan 23, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Builds on the work that @erikng did in #941
Additions:
Rework the specs to be per platform and remove some the guards that existed for *nix plugins on Windows
Add more useful fields to the gcc data
Use the same logging format everywhere
Add specs for the xcode change and rework other specs to run per platform