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

3 files changed, 12 insertions, 6 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,
diff --git a/test/functional/legacy/quickfix_spec.lua b/test/functional/legacy/quickfix_spec.lua
index 4e594062be..315b8ca682 100644
--- a/test/functional/legacy/quickfix_spec.lua
+++ b/test/functional/legacy/quickfix_spec.lua
@@ -76,7 +76,7 @@ describe('helpgrep', function()
 
       " Tests for the :colder, :cnewer, :lolder and :lnewer commands
       " Note that this test assumes that a quickfix/location list is
-      " already set by previous tests
+      " already set by the caller
       function XageTests(cchar)
         let Xolder = a:cchar . 'older'
         let Xnewer = a:cchar . 'newer'
@@ -268,15 +268,20 @@ describe('helpgrep', function()
     ]])
   end)
 
-  it('[cl]list/[cl]older/[cl]newer work', function()
+  it('clist/llist work', function()
     call('XlistTests', 'c')
     expected_empty()
     call('XlistTests', 'l')
     expected_empty()
-    -- The XageTests require existing quickfix lists, so bundle
-    -- them with the XlistTests
+  end)
+
+  it('colder/cnewer and lolder/lnewer work', function()
+    local list = {{bufnr = 1, lnum = 1}}
+    call('setqflist', list)
     call('XageTests', 'c')
     expected_empty()
+
+    call('setloclist', 0, list)
     call('XageTests', 'l')
     expected_empty()
   end)