(MODULES-1176) FFI module - allow to work on x86 / x64 #55
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
- When requiring Puppet from local source with file://c:/foo, gems necessary to run spec tests are missing. This commit ensures that on both x86 and x64, dependent gems are installed.
Iristyle
changed the title
|
@ferventcoder @cyberious another PR to look over |
|
Making some changes to tests.. don't merge yet |
|
OK, this should be ready to acceptance test... |
- Define RegDeleteKeyEx and RegQueryValueEx with FFI instead of using Ruby's Win32API which doesn't work properly on x64 due to incorrect pointer length definitions. - Move FFI introduction into guarded methods inside of base provider to avoid loading code on non-Windows. - Add some basic additional provider tests for registry_value to validate that FFI code is working properly. - Add basic test around providers destroy method for registry_key to test FFI integration code.
- Given this module now requires FFI, it's important to verify in our MSI packages, which versions shipped with at least 1.9.x. It appears that Puppet Open Source introduced a win32-dir upgrade to 0.4.3 for the release of 3.3.0. Since win32-dir requires FFI, FFI will be present in MSIs released from this point in time: https://github.com/puppetlabs/puppet-win32-ruby/commits/1.9.3/ruby/lib/ruby/gems/1.9.1/gems/ffi-1.9.0-x86-mingw32/ext/ffi_c/ffi.c - Note that the Gemfile wasn't updated until Puppet open source 3.3.2, but given it's rare to run Puppet from source on Windows, it's safe to ignore that particular discrepancy: puppetlabs/puppet@11f7c51
cyberious
added a commit
that referenced
this pull request
Aug 15, 2014
(MODULES-1176) FFI module - allow to work on x86 / x64
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.
No description provided.