Skip to content

Commit 0af5b8c

Browse files
committed
test_yamatanooroti: codepage on legacy conhost even if only display DBCS chars
test_yamatanooroti: change console condepage on legacy conhost even if only display DBCS characters (no input DBCS) omit if changing codepage failed writing DBCS characters to legacy console displays '?' character. confirmed on Windows 11 dev VM (that has no codepage 932 on legacy mode enabled conhost)
1 parent 5443ab5 commit 0af5b8c

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

test/reline/yamatanooroti/test_rendering.rb

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,12 @@ def test_simple_dialog_scrollbar_with_moving_to_left
12201220

12211221
def test_dialog_with_fullwidth_chars
12221222
ENV['RELINE_TEST_PROMPT'] = '> '
1223-
start_terminal(20, 5, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
1223+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
1224+
start_terminal(20, 5, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
1225+
else
1226+
start_terminal(20, 5, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.', codepage: 932)
1227+
omit "codepage 932 not supported" if !codepage_success?
1228+
end
12241229
6.times{ write('j') }
12251230
assert_screen(<<~'EOC')
12261231
Multi
@@ -1237,7 +1242,12 @@ def test_dialog_with_fullwidth_chars
12371242

12381243
def test_dialog_with_fullwidth_chars_split
12391244
ENV['RELINE_TEST_PROMPT'] = '> '
1240-
start_terminal(20, 6, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
1245+
unless Yamatanooroti.win? && Yamatanooroti.options.windows == :"legacy-conhost"
1246+
start_terminal(20, 6, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.')
1247+
else
1248+
start_terminal(20, 6, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog fullwidth,scrollkey,scrollbar}, startup_message: 'Multiline REPL.', codepage: 932)
1249+
omit "codepage 932 not supported" if !codepage_success?
1250+
end
12411251
6.times{ write('j') }
12421252
assert_screen(<<~'EOC')
12431253
Multil

0 commit comments

Comments
 (0)