[前][次][番号順一覧][スレッド一覧]

ruby-changes:59732

From: Charles <ko1@a...>
Date: Sat, 18 Jan 2020 00:17:40 +0900 (JST)
Subject: [ruby-changes:59732] 569f56e0f7 (master): [ruby/io-console] Filter Ruby engine name rather than just /ruby/

https://git.ruby-lang.org/ruby.git/commit/?id=569f56e0f7

From 569f56e0f74e29924a63579e77e3e60411dc0479 Mon Sep 17 00:00:00 2001
From: Charles Oliver Nutter <headius@h...>
Date: Mon, 13 Jan 2020 13:42:56 -0600
Subject: [ruby/io-console] Filter Ruby engine name rather than just /ruby/

This breaks tests using this path on JRuby because the `jruby`
executable turns into `jjruby` after the sub.

https://github.com/ruby/io-console/commit/e5951aa34c

diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
index 77c6dac..a02605d 100644
--- a/test/io/console/test_io_console.rb
+++ b/test/io/console/test_io_console.rb
@@ -462,7 +462,7 @@ defined?(IO.console) and TestIO_Console.class_eval do https://github.com/ruby/ruby/blob/trunk/test/io/console/test_io_console.rb#L462
     noctty = [EnvUtil.rubybin, "-e", "Process.daemon(true)"]
   when !(rubyw = RbConfig::CONFIG["RUBYW_INSTALL_NAME"]).empty?
     dir, base = File.split(EnvUtil.rubybin)
-    noctty = [File.join(dir, base.sub(/ruby/, rubyw))]
+    noctty = [File.join(dir, base.sub(RUBY_ENGINE, rubyw))]
   end
 
   if noctty
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]