aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-05-24 19:53:50 -0400
committerJames McCoy <jamessan@jamessan.com>2016-05-24 20:49:19 -0400
commit4a40231317c118cd4b63fb7c5f1922d6dbf78419 (patch)
treeb900eb6691d5da71722973783726060a8ed42d03 /src
parentda9b6b1de0120a86501293242073fbebe78395b7 (diff)
downloadrneovim-4a40231317c118cd4b63fb7c5f1922d6dbf78419.tar.gz
rneovim-4a40231317c118cd4b63fb7c5f1922d6dbf78419.tar.bz2
rneovim-4a40231317c118cd4b63fb7c5f1922d6dbf78419.zip
vim-patch:7.4.1071
Problem: New style tests are executed in arbitrary order. Solution: Sort the test function names. (Hirohito Higashi) Fix the quickfix test that depended on the order. https://github.com/vim/vim/commit/cfc0a350a9fa04f1b0cfa1ba31fbd2847376513f
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/runtest.vim3
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 5b34b4fc31..2712fb9371 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -65,7 +65,8 @@ function /^Test_
redir END
let tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))
-for test in tests
+" Execute the tests in alphabetical order.
+for test in sort(tests)
if exists("*SetUp")
call SetUp()
endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 46b0ebad09..835315a3ee 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -613,7 +613,7 @@ static int included_patches[] = {
// 1074 NA,
// 1073,
1072,
- // 1071,
+ 1071,
// 1070 NA
// 1069 NA
// 1068,