summaryrefslogtreecommitdiff
path: root/spec/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'spec/ruby')
-rw-r--r--spec/ruby/core/thread/each_caller_location_spec.rb4
-rw-r--r--spec/ruby/optional/capi/spec_helper.rb7
2 files changed, 2 insertions, 9 deletions
diff --git a/spec/ruby/core/thread/each_caller_location_spec.rb b/spec/ruby/core/thread/each_caller_location_spec.rb
index dbece06cd8..29c271789b 100644
--- a/spec/ruby/core/thread/each_caller_location_spec.rb
+++ b/spec/ruby/core/thread/each_caller_location_spec.rb
@@ -40,10 +40,10 @@ describe "Thread.each_caller_location" do
}.should raise_error(LocalJumpError, "no block given")
end
- it "doesn't accept positional and keyword arguments" do
+ it "doesn't accept keyword arguments" do
-> {
Thread.each_caller_location(12, foo: 10) {}
- }.should raise_error(ArgumentError, "wrong number of arguments (given 2, expected 0)")
+ }.should raise_error(ArgumentError);
end
end
end
diff --git a/spec/ruby/optional/capi/spec_helper.rb b/spec/ruby/optional/capi/spec_helper.rb
index 2691aa1332..c7364484b4 100644
--- a/spec/ruby/optional/capi/spec_helper.rb
+++ b/spec/ruby/optional/capi/spec_helper.rb
@@ -33,12 +33,6 @@ def compile_extension(name)
ruby_header = "#{rubyhdrdir}/ruby.h"
abi_header = "#{rubyhdrdir}/ruby/internal/abi.h"
- if RbConfig::CONFIG["ENABLE_SHARED"] == "yes"
- # 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
-
begin
mtime = File.mtime(lib)
rescue Errno::ENOENT
@@ -49,7 +43,6 @@ def compile_extension(name)
when mtime <= File.mtime("#{spec_ext_dir}/#{ext}.c")
when mtime <= File.mtime(ruby_header)
when (mtime <= File.mtime(abi_header) rescue nil)
- when libruby && mtime <= File.mtime(libruby)
else
return lib # up-to-date
end