1 files changed, 32 insertions, 2 deletions
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb
index 250813191b..52f86f73e5 100644
--- a/spec/ruby/core/kernel/shared/require.rb
+++ b/spec/ruby/core/kernel/shared/require.rb
@@ -223,7 +223,7 @@ describe :kernel_require, shared: true do
       it "loads c-extension file when passed absolute path without extension when no .rb is present" do
         # the error message is specific to what dlerror() returns
         path = File.join CODE_LOADING_DIR, "a", "load_fixture"
-        -> { @object.send(@method, path) }.should raise_error(Exception, /file too short|not a mach-o file/)
+        -> { @object.send(@method, path) }.should raise_error(LoadError)
       end
     end
 
@@ -231,7 +231,7 @@ describe :kernel_require, shared: true do
       it "loads .bundle file when passed absolute path with .so" do
         # the error message is specific to what dlerror() returns
         path = File.join CODE_LOADING_DIR, "a", "load_fixture.so"
-        -> { @object.send(@method, path) }.should raise_error(Exception, /load_fixture\.bundle.+(file too short|not a mach-o file)/)
+        -> { @object.send(@method, path) }.should raise_error(LoadError)
       end
     end
 
@@ -296,6 +296,16 @@ describe :kernel_require, shared: true do
       $LOAD_PATH.replace [File.expand_path("b", CODE_LOADING_DIR), CODE_LOADING_DIR]
       @object.require("load_fixture").should be_false
     end
+
+    it "stores the missing path in a LoadError object" do
+      path = "abcd1234"
+
+      -> {
+        @object.send(@method, path)
+      }.should raise_error(LoadError) { |e|
+        e.path.should == path
+      }
+    end
   end
 
   describe "(file extensions)" do
@@ -815,4 +825,24 @@ describe :kernel_require, shared: true do
       e.path.should == path
     }
   end
+
+  platform_is :linux, :darwin do
+    it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path without extension" do
+      # the error message is specific to what dlerror() returns
+      path = File.join CODE_LOADING_DIR, "a", "load_fixture"
+      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+        e.path.should == nil
+      }
+    end
+  end
+
+  platform_is :darwin do
+    it "does not store the missing path in a LoadError object when c-extension file exists but loading fails and passed absolute path with extension" do
+      # the error message is specific to what dlerror() returns
+      path = File.join CODE_LOADING_DIR, "a", "load_fixture.bundle"
+      -> { @object.send(@method, path) }.should raise_error(LoadError) { |e|
+        e.path.should == nil
+      }
+    end
+  end
 end