Skip to content

Commit 6bf1aee

Browse files
committed
Fix test failure on test_tty_ambiguous_width
Same as ruby/reline#510, 'ruby' command is not always available so don't rely on that specific name. ruby/reline@f60199fed7
1 parent ed88733 commit 6bf1aee

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From: Sorah Fukumori <her@sorah.jp>
2+
Date: Thu, 26 Dec 2024 03:47:50 +0900
3+
Subject: TestReline#test_tty_amibuous_width: use test_rubybin
4+
5+
Same as https://github.com/ruby/reline/pull/510, 'ruby' command is not
6+
always available so don't rely on that specific name.
7+
8+
https://github.com/ruby/reline/commit/f60199fed7
9+
---
10+
test/reline/test_reline.rb | 2 +-
11+
1 file changed, 1 insertion(+), 1 deletion(-)
12+
13+
diff --git a/test/reline/test_reline.rb b/test/reline/test_reline.rb
14+
index 0a4f389..691ed9f 100644
15+
--- a/test/reline/test_reline.rb
16+
+++ b/test/reline/test_reline.rb
17+
@@ -446,7 +446,7 @@ class Reline::Test < Reline::TestCase
18+
RUBY
19+
ruby_file.close
20+
lib = File.expand_path('../../lib', __dir__)
21+
- cmd = [{ 'TERM' => 'xterm' }, 'ruby', '-I', lib, ruby_file.to_path]
22+
+ cmd = [{ 'TERM' => 'xterm' }, Reline.test_rubybin, '-I', lib, ruby_file.to_path]
23+
24+
# Calculate ambiguous width from cursor position
25+
[1, 2].each do |ambiguous_width|

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ sync_default_gems-git-2.32-ignores-no-edit-in-cherry-pick.patch
1010
YJIT-Let-RubyVM-YJIT.enable-respect-yjit-stats.patch
1111
Ensure-Integer-GMP_VERSION-exists.patch
1212
gc-mmtk-keep-using-std-panic-PanicInfo-for-MSRV-1.74.patch
13+
TestReline-test_tty_amibuous_width-use-test_rubybin.patch

0 commit comments

Comments
 (0)