diff options
| author | MSP-Greg <Greg.mpls@gmail.com> | 2022-11-20 15:06:33 -0600 |
|---|---|---|
| committer | Benoit Daloze <eregontp@gmail.com> | 2022-11-21 19:52:44 +0100 |
| commit | cf05c202ce7716748c4f2f9c24b52fe7f12d40fc (patch) | |
| tree | d020a7d09f43c52c24346b2d82bef4c855e8e8ea /spec | |
| parent | 607fb49dbcf9fa24d53c3609ac4e8cba4c0fb8bb (diff) | |
Fixup spec/ruby/optional/capi/rbasic_spec.rb for mswin
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6772
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/ruby/optional/capi/rbasic_spec.rb | 1 | ||||
| -rw-r--r-- | spec/ruby/optional/capi/spec_helper.rb | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/ruby/optional/capi/rbasic_spec.rb b/spec/ruby/optional/capi/rbasic_spec.rb index 6300680d99..577f2060da 100644 --- a/spec/ruby/optional/capi/rbasic_spec.rb +++ b/spec/ruby/optional/capi/rbasic_spec.rb @@ -1,7 +1,6 @@ require_relative 'spec_helper' require_relative 'shared/rbasic' load_extension("rbasic") -return if /mswin/ =~ RUBY_PLATFORM && ENV.key?('GITHUB_ACTIONS') # not working from the beginning load_extension("data") load_extension("array") diff --git a/spec/ruby/optional/capi/spec_helper.rb b/spec/ruby/optional/capi/spec_helper.rb index ec6b909397..2691aa1332 100644 --- a/spec/ruby/optional/capi/spec_helper.rb +++ b/spec/ruby/optional/capi/spec_helper.rb @@ -34,7 +34,8 @@ def compile_extension(name) abi_header = "#{rubyhdrdir}/ruby/internal/abi.h" if RbConfig::CONFIG["ENABLE_SHARED"] == "yes" - libdirname = RbConfig::CONFIG['libdirname'] # defined since 2.1 + # below is defined since 2.1, except for mswin, and maybe other platforms + libdirname = RbConfig::CONFIG.fetch 'libdirname', 'libdir' libruby = "#{RbConfig::CONFIG[libdirname]}/#{RbConfig::CONFIG['LIBRUBY']}" end |