summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Pellé <dominique.pelle@tomtom.com>2023-09-24 22:57:41 +0200
committerChristian Brabandt <cb@256bit.org>2023-09-24 22:57:41 +0200
commitca0ffc0d63727850c520a80929698e4c199b17f4 (patch)
treea568769d0ca7088d266e7068c032f7ecd5dc26a0
parent8ffcb47a43c48d9701bb7a91b565d88aefba1d34 (diff)
patch 9.0.1931: make test_compilers fails on ubuntuv9.0.1931
Problem: make test_compilers fails on ubuntu Solution: set LC_ALL=C fix: make test_compiler failed on xubuntu 22.04.3 Problem: 'make test_compiler' failed on Linux xubuntu 22.04.3 but succeeded on e.g. macOS. To reproduce: ``` $ ./configure --with-features=huge --enable-gui=no --enable-perlinterp=yes $ make -j12 $ cd vim/src/testdir $ make test_compiler ...snip... Found errors in Test_compiler(): command line..script /home/dope/sb/vim/src/testdir/runtest.vim[601]..function RunTheTest[54]..Test_compiler line 24: command did not fail: clist command line..script /home/dope/sb/vim/src/testdir/runtest.vim[601]..function RunTheTest[54]..Test_compiler line 30: Pattern '\\n \\d\\+ Xfoo.pl:3: Global symbol "$foo" requires explicit package name' does not match '\n19 Xfoo.pl:3: Global symbol "$foo" requires explicit package name (did you forget to declare "my $foo"?)' make: *** [Makefile:70: test_compiler] Error 1 ``` Solution: set `LC_ALL` to "C" in `Test_compiler()` closes: #13173 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Dominique Pellé <dominique.pelle@tomtom.com>
-rw-r--r--src/testdir/test_compiler.vim7
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim
index 781bac67a9..4b710df07c 100644
--- a/src/testdir/test_compiler.vim
+++ b/src/testdir/test_compiler.vim
@@ -7,10 +7,8 @@ func Test_compiler()
CheckExecutable perl
CheckFeature quickfix
- " $LANG changes the output of Perl.
- if $LANG != ''
- unlet $LANG
- endif
+ let save_LC_ALL = $LC_ALL
+ let $LC_ALL= "C"
" %:S does not work properly with 'shellslash' set
let save_shellslash = &shellslash
@@ -40,6 +38,7 @@ func Test_compiler()
let &shellslash = save_shellslash
call delete('Xfoo.pl')
bw!
+ let $LC_ALL = save_LC_ALL
endfunc
func GetCompilerNames()
diff --git a/src/version.c b/src/version.c
index f30b08e4ae..b5ffdd1fe6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1931,
+/**/
1930,
/**/
1929,