[Truffle] Fix -S

jruby · Dec 9, 2016 · 80cc7f1 · 80cc7f1
1 parent 07df8f1
commit 80cc7f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/test/truffle/integration/irb.sh b/test/truffle/integration/irb.sh
@@ -4,7 +4,7 @@ source test/truffle/common.sh.inc
 
 set -e
 
-jt ruby -rirb -e 'IRB.start(__FILE__)' < test/truffle/integration/irb/input.txt > temp.txt
+jt ruby -S irb < test/truffle/integration/irb/input.txt > temp.txt
 
 if ! cmp --silent temp.txt test/truffle/integration/irb/output.txt
 then

diff --git a/truffle/src/main/java/org/jruby/truffle/options/ArgumentProcessor.java b/truffle/src/main/java/org/jruby/truffle/options/ArgumentProcessor.java
@@ -601,17 +601,17 @@ private String resolve(String path, String scriptName) {
         if (RubyInstanceConfig.DEBUG_SCRIPT_RESOLUTION) {
             config.getError().println("Trying path: " + path);
         }
-        /*try {
-            FileResource fullName = JRubyFile.createRestrictedResource(path, scriptName);
+        try {
+            File fullName = new File(path, scriptName);
             if (fullName.exists() && fullName.isFile()) {
                 if (RubyInstanceConfig.DEBUG_SCRIPT_RESOLUTION) {
-                    config.getError().println("Found: " + fullName.absolutePath());
+                    config.getError().println("Found: " + fullName.getAbsolutePath());
                 }
-                return fullName.absolutePath();
+                return fullName.getAbsolutePath();
             }
         } catch (Exception e) {
             // keep going
-        }*/
+        }
         return null;
     }