From 5559cabf4d851edb94cc2f09d50bcf0a04bd0819 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 26 Oct 2022 22:38:47 +0800
Subject: vim-patch:8.2.0531: various errors not tested

Problem:    Various errors not tested.
Solution:   Add tests. (Yegappan Lakshmanan, closes vim/vim#5895)

https://github.com/vim/vim/commit/476a613135bdc94e61c1dce8a9cbb4ab0b6dc2d1

Need to remove "F" flag from 'shortmess' as early as possible.
---
 src/nvim/testdir/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/testdir/Makefile')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 4641408069..a6d1cf1003 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -179,4 +179,4 @@ newtestssilent: $(NEW_TESTS_RES)
 	@echo "[OLDTEST] Running" $*
 	@rm -rf $*.failed test.ok $(RM_ON_RUN)
 	@mkdir -p $(TMPDIR)
-	@/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) $(NO_INITS) -u NONE -S runtest.vim $*.vim
+	@/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) $(NO_INITS) -u NONE --cmd "set shortmess-=F" -S runtest.vim $*.vim
-- 
cgit 


From f3cea06d0114f2bcd2176b4a026d2bd4b68871d8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 6 Nov 2022 20:22:37 +0800
Subject: test(old): remove stray test42 files (#20966)

Forgot to remove in #17350.
---
 src/nvim/testdir/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/nvim/testdir/Makefile')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index a6d1cf1003..2d2853ead7 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -13,8 +13,7 @@ export SHELL := sh
 export NVIM_PRG := $(NVIM_PRG)
 export TMPDIR := $(abspath Xtest-tmpdir)
 
-SCRIPTS_DEFAULT = \
-	test42.out             \
+SCRIPTS_DEFAULT =
 
 ifneq ($(OS),Windows_NT)
   SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \
-- 
cgit 


From 8a29d9660ea27ff3cd55555f9373b1528808b264 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 3 Dec 2022 13:48:51 +0800
Subject: vim-patch:8.2.1420: test 49 is old style

Problem:    Test 49 is old style.
Solution:   Convert remaining parts to new style. Remove obsolete items.
            (Yegappan Lakshmanan, closes vim/vim#6683)

https://github.com/vim/vim/commit/f7c4d83609acdfe0e4d0fec9413697ac97c0c3f9
---
 src/nvim/testdir/Makefile | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'src/nvim/testdir/Makefile')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 2d2853ead7..0684b3798e 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -13,22 +13,12 @@ export SHELL := sh
 export NVIM_PRG := $(NVIM_PRG)
 export TMPDIR := $(abspath Xtest-tmpdir)
 
-SCRIPTS_DEFAULT =
-
-ifneq ($(OS),Windows_NT)
-  SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \
-	test49.out             \
-
-endif
-
 ifeq ($(OS),Windows_NT)
   FIXFF = fixff
 else
   FIXFF =
 endif
 
-SCRIPTS ?= $(SCRIPTS_DEFAULT)
-
 # Tests using runtest.vim.
 NEW_TESTS_ALOT := test_alot_utf8 test_alot test_alot_latin
 NEW_TESTS_IN_ALOT := $(shell sed -n '/^source/ s/^source //; s/\.vim$$//p' $(addsuffix .vim,$(NEW_TESTS_ALOT)))
@@ -65,11 +55,7 @@ else
 	endif
 endif
 
-ifdef TESTNUM
-	SCRIPTS := test$(TESTNUM).out
-endif
-
-nongui: nolog $(FIXFF) $(SCRIPTS) newtests report
+nongui: nolog $(FIXFF) newtests report
 
 .gdbinit:
 	@echo "[OLDTEST-PREP] Setting up .gdbinit"
@@ -87,8 +73,6 @@ report:
 
 test1.out: $(NVIM_PRG)
 
-$(SCRIPTS): $(NVIM_PRG) test1.out
-
 NO_PLUGINS = --noplugin --headless
 # In vim, if the -u command line option is specified, compatible is turned on
 # and viminfo is not read. Unlike vim, neovim reads viminfo and requires the
@@ -146,17 +130,6 @@ test1.out: .gdbinit test1.in
 	@rm -f wrongtermsize
 	@rm -rf X* viminfo
 
-%.out: %.in .gdbinit
-	@echo "[OLDESTTEST] Running" $*
-	@rm -rf $*.failed test.ok $(RM_ON_RUN)
-	@mkdir -p $(TMPDIR)
-	@cp $*.ok test.ok
-	@/bin/sh runnvim.sh --oldesttest $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in
-	@rm -rf X* test.ok viminfo
-
-# Explicit dependencies.
-test49.out: test49.vim
-
 nolog:
 	@echo "[OLDTEST-PREP] Removing test.log and messages"
 	@rm -f test.log messages
-- 
cgit 


From 8b3412636a1027eaa14a95211efb449b58e9a01e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 9 Dec 2022 07:51:37 +0800
Subject: test(old): change $TMPDIR from Xtest-tmpdir to X-test-tmpdir (#21346)

I've noticed a patch 8.2.4376 that uses more Xtest directories.
Change $TMPDIR to X-test-tmpdir to avoid more future divergence.
---
 src/nvim/testdir/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/testdir/Makefile')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 0684b3798e..9511b311e6 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -11,7 +11,7 @@ ROOT := ../../..
 
 export SHELL := sh
 export NVIM_PRG := $(NVIM_PRG)
-export TMPDIR := $(abspath Xtest-tmpdir)
+export TMPDIR := $(abspath X-test-tmpdir)
 
 ifeq ($(OS),Windows_NT)
   FIXFF = fixff
-- 
cgit