From b6c66ead9da8e4a8a0aeed0eece056d74273b6d9 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 2 Dec 2022 12:08:25 +0900
Subject: [ruby/irb] Use the proper ruby command and library path

https://github.com/ruby/irb/commit/1416cc1871
---
 test/irb/test_debug_cmd.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/irb/test_debug_cmd.rb b/test/irb/test_debug_cmd.rb
index 50ce904657..69e1e97015 100644
--- a/test/irb/test_debug_cmd.rb
+++ b/test/irb/test_debug_cmd.rb
@@ -3,10 +3,13 @@
 require "pty" unless RUBY_ENGINE == 'truffleruby'
 require "tempfile"
 require "tmpdir"
+require "envutil"
 
 require_relative "helper"
 
 module TestIRB
+  LIB = File.expand_path("../../lib", __dir__)
+
   class DebugCommandTestCase < TestCase
     IRB_AND_DEBUGGER_OPTIONS = {
       "RUBY_DEBUG_NO_RELINE" => "true", "NO_COLOR" => "true", "RUBY_DEBUG_HISTORY_FILE" => ''
@@ -196,7 +199,7 @@ module TestIRB
     private
 
     def run_ruby_file(&block)
-      cmd = "ruby -Ilib #{@ruby_file.to_path}"
+      cmd = [EnvUtil.rubybin, "-I", LIB, @ruby_file.to_path]
       tmp_dir = Dir.mktmpdir
       rc_file = File.open(File.join(tmp_dir, ".irbrc"), "w+")
       rc_file.write("IRB.conf[:USE_SINGLELINE] = true")
@@ -207,7 +210,7 @@ module TestIRB
 
       yield
 
-      PTY.spawn(IRB_AND_DEBUGGER_OPTIONS.merge("IRBRC" => rc_file.to_path), cmd) do |read, write, pid|
+      PTY.spawn(IRB_AND_DEBUGGER_OPTIONS.merge("IRBRC" => rc_file.to_path), *cmd) do |read, write, pid|
         Timeout.timeout(3) do
           while line = safe_gets(read)
             lines << line
-- 
cgit v1.2.3