[Truffle] Don't expect random things like jirb to be on PATH.

jruby · Dec 9, 2016 · 07df8f1 · 07df8f1
1 parent 3113f09
commit 07df8f1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 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 -S irb < test/truffle/integration/irb/input.txt > temp.txt
+jt ruby -rirb -e 'IRB.start(__FILE__)' < 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
@@ -585,9 +585,6 @@ private void processEncodingOption(String value) {
 
     private void runBinScript() {
         String scriptName = grabValue("jruby: provide a bin script to execute");
-        if (scriptName.equals("irb")) {
-            scriptName = "jirb";
-        }
         config.setScriptFileName(resolveScript(scriptName));
         // run as a command if we couldn't find a script
         if (config.getScriptFileName() == null) {