Commit: patch 9.1.0706: tests: test_gettext fails when using shadow dir

6 views
Skip to first unread message

Christian Brabandt

unread,
Aug 31, 2024, 11:30:10 AM8/31/24
to vim...@googlegroups.com
patch 9.1.0706: tests: test_gettext fails when using shadow dir

Commit: https://github.com/vim/vim/commit/75ba87ba622e6a972c09f5d52573ea0679df4895
Author: James McCoy <jame...@jamessan.com>
Date: Sat Aug 31 17:10:26 2024 +0200

patch 9.1.0706: tests: test_gettext fails when using shadow dir

Problem: tests: test_gettext fails when using shadow dir
Solution: Link the ru_RU directory into the shadow testdir
(James McCoy)

Link the ru_RU directory into shadow testdir

When the ru_RU locale is present, but the build is using a shadowdir,
then test_gettext_cp1251.vim and test_gettext_utf8.vim fail:

From test_gettext_cp1251.vim:
Executed Test_gettext() in 0.000848 seconds
Executed 1 test in 0.007010 seconds
1 FAILED:
Found errors in Test_gettext():
command line..script /home/runner/work/vim/vim/src/shadow/testdir/runtest.vim[607]..function RunTheTest[57]..Test_gettext line 9: Expected '������: ' but got 'ERROR: '

From test_gettext_utf8.vim:
Executed Test_gettext() in 0.000908 seconds
Executed 1 test in 0.007339 seconds
1 FAILED:
Found errors in Test_gettext():
command line..script /home/runner/work/vim/vim/src/shadow/testdir/runtest.vim[607]..function RunTheTest[57]..Test_gettext line 9: Expected '������: ' but got 'ERROR: '

This is because it's unable to load the translations from the ru_RU test
directory, since it wasn't symlinked into the shadow directory.

closes: #15591

Signed-off-by: James McCoy <jame...@jamessan.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/Makefile b/src/Makefile
index 257742f4c..0b4a453ac 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2939,6 +2939,7 @@ shadow: runtime pixmaps
../../testdir/*.py \
../../testdir/python* \
../../testdir/pyxfile \
+ ../../testdir/ru_RU \
../../testdir/sautest \
../../testdir/samples \
../../testdir/dumps \
diff --git a/src/version.c b/src/version.c
index 6d374eb78..b88ec9de3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 706,
/**/
705,
/**/
Reply all
Reply to author
Forward
0 new messages