From 0a98765b44927e689af20a8d2484bec2ac17900d Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 11 Aug 2019 13:19:59 +0200
Subject: test_source.vim: move Test_source_sandbox

---
 src/nvim/testdir/test_source.vim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/nvim/testdir/test_source.vim')

diff --git a/src/nvim/testdir/test_source.vim b/src/nvim/testdir/test_source.vim
index 697b552df4..5166bafb15 100644
--- a/src/nvim/testdir/test_source.vim
+++ b/src/nvim/testdir/test_source.vim
@@ -1,14 +1,5 @@
 " Tests for the :source command.
 
-func Test_source_sandbox()
-  new
-  call writefile(["Ohello\<Esc>"], 'Xsourcehello')
-  source! Xsourcehello | echo
-  call assert_equal('hello', getline(1))
-  call assert_fails('sandbox source! Xsourcehello', 'E48:')
-  bwipe!
-endfunc
-
 func Test_source_autocmd()
   call writefile([
 	\ 'let did_source = 1',
@@ -45,3 +36,12 @@ func Test_source_cmd()
   au! SourcePre
   au! SourcePost
 endfunc
+
+func Test_source_sandbox()
+  new
+  call writefile(["Ohello\<Esc>"], 'Xsourcehello')
+  source! Xsourcehello | echo
+  call assert_equal('hello', getline(1))
+  call assert_fails('sandbox source! Xsourcehello', 'E48:')
+  bwipe!
+endfunc
-- 
cgit 


From 143b02c573ffafbc04301ee539150ec0c936a3e9 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 11 Aug 2019 13:18:29 +0200
Subject: vim-patch:8.1.1461: tests do not run or are not reliable on some
 systems

Problem:    Tests do not run or are not reliable on some systems.
Solution:   Use "findstr" instead of "grep" on MS-Windows. Clear
            PROMPT_COMMAND in the terminal test. Delete temp file. Wait for
            output after executing a debug command. (Yegappan Lakshmanan,
            closes vim/vim#4479)
https://github.com/vim/vim/commit/ddd3308782e931a2c390d692cb23c40d8169bd6f

Ignored changes to testdir/test_terminal.vim.
---
 src/nvim/testdir/test_source.vim | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nvim/testdir/test_source.vim')

diff --git a/src/nvim/testdir/test_source.vim b/src/nvim/testdir/test_source.vim
index 5166bafb15..09baec0b7d 100644
--- a/src/nvim/testdir/test_source.vim
+++ b/src/nvim/testdir/test_source.vim
@@ -44,4 +44,5 @@ func Test_source_sandbox()
   call assert_equal('hello', getline(1))
   call assert_fails('sandbox source! Xsourcehello', 'E48:')
   bwipe!
+  call delete('Xsourcehello')
 endfunc
-- 
cgit