patch 9.1.2119: tests: Test_language_cmd fails on OpenBSD

Problem:  tests: Test_language_cmd fails on OpenBSD because the test
          uses an invalid locale name and expects the command to produce
          an error. OpenBSD accepts (almost) any locale name as valid by
          design, so the :lang command succeeds and the test fails.
Solution: Slightly update the "bad" locale name to make it something
          that OpenBSD considers invalid by adding a dot (but not ending
          with ".UTF-8"). Maintain the original two underscores in the
          name because that ensures Windows will also see it as invalid
          (Kevin Goodsell).

closes: #19280

Signed-off-by: Kevin Goodsell <kevin-opensource@omegacrash.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index 8c3282855ec1912b829fc975a9eab0573bfee987..c671adfe9477df8bbc2cc5f1c2910c40fc594c9c 100644 (file)
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -236,8 +236,15 @@ endfunc
 func Test_language_cmd()
   CheckFeature multi_lang
 
 func Test_language_cmd()
   CheckFeature multi_lang
 

-  call assert_fails('language ctype non_existing_lang', 'E197:')
-  call assert_fails('language time non_existing_lang', 'E197:')
+  " OpenBSD allows nearly arbitrary locale names, since it largely ignores them
+  " (see setlocale(3)). One useful exception for this test is that in doesn't
+  " allow names containing dots unless they end in '.UTF-8'.
+  "
+  " Windows also allows nonsensical locale names, though it seems to reject
+  " names with multiple underscores (possibly expecting 'language_region', but
+  " not 'language_region_additional').
+  call assert_fails('language ctype non_existing_lang.bad', 'E197:')
+  call assert_fails('language time non_existing_lang.bad', 'E197:')

 endfunc
 
 " Test for the :confirm command dialog
 endfunc
 
 " Test for the :confirm command dialog

diff --git a/src/version.c b/src/version.c
index c43326bbd728d95974a94608bba9cc3482726ca3..b52290a8593d3aef07f9fc5facb46e9816edcfdb 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 */
 
 static int included_patches[] =
 {   /* Add new patch number below this line */

+/**/
+    2119,

 /**/
     2118,
 /**/
 /**/
     2118,
 /**/