diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-09-18 21:42:38 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-09-18 21:42:38 +0200 |
commit | cebfcffa40c058119bc2f92f0db02dffd3f6affe (patch) | |
tree | 11467a3eb509c142fb1480f1a4411a66f068603e | |
parent | d103ee78432f9036d243b18dd5aac1263d3b7dc9 (diff) | |
download | vim-git-cebfcffa40c058119bc2f92f0db02dffd3f6affe.tar.gz |
patch 8.1.2054: compiler test for Perl may failv8.1.2054
Problem: Compiler test for Perl may fail.
Solution: Accept any error line number. (James McCoy, closes #4944)
-rw-r--r-- | src/testdir/test_compiler.vim | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim index f561e84a3..40d3cdbda 100644 --- a/src/testdir/test_compiler.vim +++ b/src/testdir/test_compiler.vim @@ -28,8 +28,9 @@ func Test_compiler() w! call feedkeys(":make\<CR>\<CR>", 'tx') let a=execute('clist') - call assert_match("\n 1 Xfoo.pl:3: Global symbol \"\$foo\" " - \ . "requires explicit package name", a) + call assert_match('\n \d\+ Xfoo.pl:3: Global symbol "$foo" ' + \ . 'requires explicit package name', a) + let &shellslash = save_shellslash call delete('Xfoo.pl') diff --git a/src/version.c b/src/version.c index debc3d7b1..872088689 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2054, +/**/ 2053, /**/ 2052, |