[Truffle] Remove explicit loading from current directory.

jruby · Feb 23, 2015 · f70ef66 · f70ef66
1 parent 10fafff
commit f70ef66
Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/spec/truffle/tags/language/file_tags.txt b/spec/truffle/tags/language/file_tags.txt
@@ -1,2 +1,3 @@
 windows:The __FILE__ pseudo-variable equals the absolute path of a file loaded by an absolute path
 windows:The __FILE__ pseudo-variable equals the absolute path of a file loaded by a relative path
+fails:The __FILE__ pseudo-variable equals the absolute path of a file loaded by a relative path
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
@@ -68,12 +68,6 @@ public boolean require(String path, String feature, RubyNode currentNode) throws
                     return true;
                 }
 
-                // Try as a path relative to the current directory
-
-                if (requireInPath(context.getRuntime().getCurrentDirectory(), feature, currentNode)) {
-                    return true;
-                }
-
                 // Try each load path in turn
 
                 for (Object pathObject : context.getCoreLibrary().getLoadPath().slowToArray()) {