Fix specs for Kernel#require

Author: andrykonchin

spec/ruby/core/kernel/shared/require.rb

@@ -296,6 +296,16 @@
       $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 @@
       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

spec/tags/core/kernel/require_tags.txt

@@ -6,8 +6,3 @@ slow:Kernel#require ($LOADED_FEATURES) complex, enumerator, rational, thread, ru
 slow:Kernel.require ($LOADED_FEATURES) complex, enumerator, rational, thread, ruby2_keywords are already required
 slow:Kernel#require complex, enumerator, rational, thread, ruby2_keywords, fiber are already required
 slow:Kernel#require complex, enumerator, fiber, rational, thread, ruby2_keywords are already required
-fails:Kernel#require complex, enumerator, fiber, rational, thread, ruby2_keywords are already required
-fails:Kernel#require (path resolution) loads c-extension file when passed absolute path without extension when no .rb is present
-fails:Kernel#require (path resolution) loads .bundle file when passed absolute path with .so
-fails:Kernel.require (path resolution) loads c-extension file when passed absolute path without extension when no .rb is present
-fails:Kernel.require (path resolution) loads .bundle file when passed absolute path with .so

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

@@ -975,6 +975,16 @@ public RubyException loadError(String message, String path, Node currentNode) {
         return loadError;
     }
 
+    @TruffleBoundary
+    public RubyException loadError(String message, Node currentNode) {
+        RubyString messageString = StringOperations.createUTF8String(context, language, message);
+        RubyClass exceptionClass = context.getCoreLibrary().loadErrorClass;
+        RubyException loadError = ExceptionOperations
+                .createRubyException(context, exceptionClass, messageString, currentNode, null);
+
+        return loadError;
+    }
+
     @TruffleBoundary
     public RubyException loadErrorCannotLoad(String name, Node currentNode) {
         return loadError(StringUtils.format("cannot load such file -- %s", name), name, currentNode);

src/main/java/org/truffleruby/language/loader/RequireNode.java

@@ -308,7 +308,7 @@ private void handleCExtensionException(String feature, Exception e) {
                 message = linkError;
             }
 
-            throw new RaiseException(getContext(), getContext().getCoreExceptions().runtimeError(message, this));
+            throw new RaiseException(getContext(), getContext().getCoreExceptions().loadError(message, this));
         }
 
         final Throwable linkerException = searchForException("LLVMLinkerException", e);