[Truffle] Fix last __FILE__ spec.

jruby · Dec 30, 2015 · 8dc8ccc · 8dc8ccc
1 parent 5a3de79
commit 8dc8ccc
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/spec/truffle/tags/language/file_tags.txt b/spec/truffle/tags/language/file_tags.txt
@@ -1,3 +1,2 @@
 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/loader/FeatureLoader.java b/truffle/src/main/java/org/jruby/truffle/runtime/loader/FeatureLoader.java
@@ -196,11 +196,12 @@ public static String expandPath(RubyContext context, String fileName) {
 
             return expanded.asJavaString();
         } else {
-            return expandPath(fileName, null);
+            String dir = new File(fileName).isAbsolute() ? null : context.getRuntime().getCurrentDirectory();
+            return expandPath(fileName, dir);
         }
     }
 
-    public static String expandPath(String fileName, String dir) {
+    private static String expandPath(String fileName, String dir) {
         /*
          * TODO(cs): this isn't quite correct - I think we want to collapse .., but we don't want to
          * resolve symlinks etc. This might be where we want to start borrowing JRuby's