patch 9.2.0120: tests: test_normal fails

Problem:  tests: test_normal fails
Solution: Ensure the terminal width is 40 columns and also
          check for existence of the tr.mo file

closes: #19608

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index f41ae0552ca01f29de46cba8c4e87a973fa1f22c..20adb24b1ed1bdfdf963a0ace98cd05cb2fa3ba0 100644 (file)
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -4389,6 +4389,9 @@ func Test_pos_percentage_in_turkish_locale()
   CheckRunVimInTerminal
   CheckNotMac
   defer execute(':lang C')
+  if !filereadable('../po/tr.mo')
+        throw 'Skipped: tr.mo not built, run make in src/po first'
+  endif
 
   try
     let dir = expand('$VIMRUNTIME/lang/tr/')
@@ -4398,7 +4401,7 @@ func Test_pos_percentage_in_turkish_locale()
     call mkdir(target, '')
     call filecopy(tr, target .. 'vim.mo')
     lang tr_TR.UTF-8
-    let buf = RunVimInTerminal('', {'rows': 5})
+    let buf = RunVimInTerminal('', {'rows': 5, 'cols': 40})
     call term_sendkeys(buf, ":lang tr_TR.UTF-8\<cr>")
     call term_sendkeys(buf, ":put =range(1,40)\<cr>")
     call term_sendkeys(buf, ":5\<cr>")

diff --git a/src/version.c b/src/version.c
index 1135e03cca02e9331854784eed6bd6b285f4ba1a..5fd399c977cfc7735b41c8a6697e78b3f2061f78 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    120,
 /**/
     119,
 /**/