[Truffle] Expand a path in $LOAD_PATH if it is relative.

jruby · Mar 6, 2015 · ea53fd6 · ea53fd6
1 parent 034c7cd
commit ea53fd6
Showing 1 changed file with 4 additions and 1 deletion.
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
@@ -70,7 +70,10 @@ public boolean require(String feature, Node currentNode) throws IOException {
                 // Try each load path in turn
 
                 for (Object pathObject : context.getCoreLibrary().getLoadPath().slowToArray()) {
-                    final String loadPath = pathObject.toString();
+                    String loadPath = pathObject.toString();
+                    if (!isAbsolutePath(loadPath)) {
+                        loadPath = RubyFile.expandPath(context, loadPath);
+                    }
 
                     if (requireInPath(loadPath, feature, currentNode)) {
                         return true;