test: move oldtests to test directory (#22536)

The new oldtest directory is in test/old/testdir. The reason for this is
that many tests have hardcoded the parent directory name to be
'testdir'.

267 files changed, 30 insertions, 28 deletions

diff --git a/.gitattributes b/.gitattributes
index a1aa7e155f..1128560dc2 100755
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,4 @@ src/xdiff/**    linguist-vendored
 src/cjson/**    linguist-vendored
 src/unicode/**  linguist-vendored
 
-src/nvim/testdir/test42.in diff
-
 .github/    export-ignore
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 16bbca7050..e6c134b583 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -366,5 +366,5 @@ jobs:
           # But would break functionaltest, where its `more` would be used then.
           $OldPath = $env:PATH
           $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-          & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path src\nvim\testdir) VERBOSE=1
+          & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path test\old\testdir) VERBOSE=1
           $env:PATH = $OldPath
diff --git a/.gitignore b/.gitignore
index 57acde8722..b20d9ef19b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,21 +36,21 @@ compile_commands.json
 *.rej
 
 # Generated by old (Vim) tests.
-/src/nvim/testdir/del
-/src/nvim/testdir/test*.out
-/src/nvim/testdir/test*.res
-/src/nvim/testdir/test*.log
-/src/nvim/testdir/messages
-/src/nvim/testdir/viminfo
-/src/nvim/testdir/test.ok
-/src/nvim/testdir/*.failed
-/src/nvim/testdir/X*
-/src/nvim/testdir/valgrind.*
-/src/nvim/testdir/.gdbinit
+/test/old/testdir/testdir/del
+/test/old/testdir/testdir/test*.out
+/test/old/testdir/testdir/test*.res
+/test/old/testdir/testdir/test*.log
+/test/old/testdir/testdir/messages
+/test/old/testdir/testdir/viminfo
+/test/old/testdir/testdir/test.ok
+/test/old/testdir/testdir/*.failed
+/test/old/testdir/testdir/X*
+/test/old/testdir/testdir/valgrind.*
+/test/old/testdir/testdir/.gdbinit
 /runtime/indent/testdir/*.out
 +runtime/indent/testdir/*.fail
-# Generated by src/nvim/testdir/runnvim.sh.
-/src/nvim/testdir/*.tlog
+# Generated by test/old/testdir/testdir/runnvim.sh.
+/test/old/testdir/testdir/*.tlog
 
 # Generated by unit tests.
 /test/includes/post/
diff --git a/Makefile b/Makefile
index dc5833d0bf..20435d615e 100644
--- a/Makefile
+++ b/Makefile
@@ -113,17 +113,17 @@ build/.ran-deps-cmake::
 
 # TODO: cmake 3.2+ add_custom_target() has a USES_TERMINAL flag.
 oldtest: | nvim build/runtime/doc/tags
-	+$(SINGLE_MAKE) -C src/nvim/testdir clean
+	+$(SINGLE_MAKE) -C test/old/testdir clean
 ifeq ($(strip $(TEST_FILE)),)
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) $(MAKEOVERRIDES)
+	+$(SINGLE_MAKE) -C test/old/testdir NVIM_PRG=$(NVIM_PRG) $(MAKEOVERRIDES)
 else
 	@# Handle TEST_FILE=test_foo{,.res,.vim}.
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst %.vim,%,$(patsubst %.res,%,$(TEST_FILE)))
+	+$(SINGLE_MAKE) -C test/old/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst %.vim,%,$(patsubst %.res,%,$(TEST_FILE)))
 endif
 # Build oldtest by specifying the relative .vim filename.
 .PHONY: phony_force
-src/nvim/testdir/%.vim: phony_force
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst src/nvim/testdir/%.vim,%,$@)
+test/old/testdir/%.vim: phony_force
+	+$(SINGLE_MAKE) -C test/old/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst test/old/testdir/%.vim,%,$@)
 
 functionaltest-lua: | nvim
 	$(BUILD_TOOL) -C build $@
@@ -143,7 +143,7 @@ iwyu: build/.ran-cmake
 
 clean:
 	+test -d build && $(BUILD_TOOL) -C build clean || true
-	$(MAKE) -C src/nvim/testdir clean
+	$(MAKE) -C test/old/testdir clean
 	$(MAKE) -C runtime/indent clean
 
 distclean:
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index f9f7330097..06ddf0f3b8 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -226,6 +226,10 @@ preprocess_patch() {
   local na_vimrcexample='vimrc_example\.vim'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/\<\%('${na_vimrcexample}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
 
+  # Rename src/testdir/ paths to test/old/testdir/
+  LC_ALL=C sed -e 's/\( [ab]\)\/src\/testdir/\1\/test\/old\/testdir/g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
+
   # Rename src/ paths to src/nvim/
   LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
diff --git a/test/README.md b/test/README.md
index a67040e68c..d8d918eb61 100644
--- a/test/README.md
+++ b/test/README.md
@@ -3,7 +3,7 @@ Tests
 
 Tests are broadly divided into *unit tests* ([test/unit](https://github.com/neovim/neovim/tree/master/test/unit/)),
 *functional tests* ([test/functional](https://github.com/neovim/neovim/tree/master/test/functional/)),
-and *old tests* ([src/nvim/testdir/](https://github.com/neovim/neovim/tree/master/src/nvim/testdir/)).
+and *old tests* ([test/old/testdir/](https://github.com/neovim/neovim/tree/master/test/old/testdir/)).
 
 - _Unit_ testing is achieved by compiling the tests as a shared library which is
   loaded and called by [LuaJit FFI](http://luajit.org/ext_ffi.html).
@@ -48,7 +48,7 @@ Layout
 - `/test/*/**/*_spec.lua` : actual tests. Files that do not end with
   `_spec.lua` are libraries like `/test/**/helpers.lua`, except that they have
   some common topic.
-- `/src/nvim/testdir` : old tests (from Vim)
+- `/test/old/testdir` : old tests (from Vim)
 
 
 Running tests
@@ -83,7 +83,7 @@ To run a *single* legacy test file you can use either:
 
 or:
 
-    make src/nvim/testdir/test_syntax.vim
+    make test/old/testdir/test_syntax.vim
 
 - Specify only the test file name, not the full path.
 
diff --git a/test/benchmark/bench_regexp_spec.lua b/test/benchmark/bench_regexp_spec.lua
index 903af5f574..6128549f0f 100644
--- a/test/benchmark/bench_regexp_spec.lua
+++ b/test/benchmark/bench_regexp_spec.lua
@@ -7,7 +7,7 @@ local clear, command = helpers.clear, helpers.command
 -- Temporary file for gathering benchmarking results for each regexp engine.
 local result_file = 'benchmark.out'
 -- Fixture containing an HTML fragment that can make a search appear to freeze.
-local sample_file = 'src/nvim/testdir/samples/re.freeze.txt'
+local sample_file = 'test/old/testdir/samples/re.freeze.txt'
 
 -- Vim script code that does both the work and the benchmarking of that work.
 local measure_cmd =
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index cd6b535477..43e5b73608 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -898,7 +898,7 @@ local load_factor = 1
 if global_helpers.is_ci() then
   -- Compute load factor only once (but outside of any tests).
   module.clear()
-  module.request('nvim_command', 'source src/nvim/testdir/load.vim')
+  module.request('nvim_command', 'source test/old/testdir/load.vim')
   load_factor = module.request('nvim_eval', 'g:test_load_factor')
 end
 function module.load_adjust(num)
diff --git a/test/functional/legacy/options_spec.lua b/test/functional/legacy/options_spec.lua
index bd14f3bc53..ce46ea013d 100644
--- a/test/functional/legacy/options_spec.lua
+++ b/test/functional/legacy/options_spec.lua
@@ -1,4 +1,4 @@
--- See also: src/nvim/testdir/test_options.vim
+-- See also: test/old/testdir/test_options.vim
 local helpers = require('test.functional.helpers')(after_each)
 local command, clear = helpers.command, helpers.clear
 local source, expect = helpers.source, helpers.expect
diff --git a/src/nvim/testdir/Make_all.mak b/test/old/testdir/Make_all.mak
index b917877422..b917877422 100644
--- a/src/nvim/testdir/Make_all.mak
+++ b/test/old/testdir/Make_all.mak
diff --git a/src/nvim/testdir/Makefile b/test/old/testdir/Makefile
index 9511b311e6..9511b311e6 100644
--- a/src/nvim/testdir/Makefile
+++ b/test/old/testdir/Makefile
diff --git a/src/nvim/testdir/README.txt b/test/old/testdir/README.txt
index b8bc52f1e6..b8bc52f1e6 100644
--- a/src/nvim/testdir/README.txt
+++ b/test/old/testdir/README.txt
diff --git a/src/nvim/testdir/check.vim b/test/old/testdir/check.vim
index 680a59006b..680a59006b 100644
--- a/src/nvim/testdir/check.vim
+++ b/test/old/testdir/check.vim
diff --git a/src/nvim/testdir/dotest.in b/test/old/testdir/dotest.in
index 2ef4576f4e..2ef4576f4e 100644
--- a/src/nvim/testdir/dotest.in
+++ b/test/old/testdir/dotest.in
diff --git a/src/nvim/testdir/load.vim b/test/old/testdir/load.vim
index 5697ee7304..5697ee7304 100644
--- a/src/nvim/testdir/load.vim
+++ b/test/old/testdir/load.vim
diff --git a/src/nvim/testdir/pyxfile/py2_magic.py b/test/old/testdir/pyxfile/py2_magic.py
index 819892fd16..819892fd16 100644
--- a/src/nvim/testdir/pyxfile/py2_magic.py
+++ b/test/old/testdir/pyxfile/py2_magic.py
diff --git a/src/nvim/testdir/pyxfile/py2_shebang.py b/test/old/testdir/pyxfile/py2_shebang.py
index 13bfc491ec..13bfc491ec 100644
--- a/src/nvim/testdir/pyxfile/py2_shebang.py
+++ b/test/old/testdir/pyxfile/py2_shebang.py
diff --git a/src/nvim/testdir/pyxfile/py3_magic.py b/test/old/testdir/pyxfile/py3_magic.py
index d4b7ee0071..d4b7ee0071 100644
--- a/src/nvim/testdir/pyxfile/py3_magic.py
+++ b/test/old/testdir/pyxfile/py3_magic.py
diff --git a/src/nvim/testdir/pyxfile/py3_shebang.py b/test/old/testdir/pyxfile/py3_shebang.py
index ec05808ca4..ec05808ca4 100644
--- a/src/nvim/testdir/pyxfile/py3_shebang.py
+++ b/test/old/testdir/pyxfile/py3_shebang.py
diff --git a/src/nvim/testdir/pyxfile/pyx.py b/test/old/testdir/pyxfile/pyx.py
index 261a6512c0..261a6512c0 100644
--- a/src/nvim/testdir/pyxfile/pyx.py
+++ b/test/old/testdir/pyxfile/pyx.py
diff --git a/src/nvim/testdir/runnvim.sh b/test/old/testdir/runnvim.sh
index 4d8ea0527d..4d8ea0527d 100755
--- a/src/nvim/testdir/runnvim.sh
+++ b/test/old/testdir/runnvim.sh
diff --git a/src/nvim/testdir/runnvim.vim b/test/old/testdir/runnvim.vim
index a46e2d3fc0..a46e2d3fc0 100644
--- a/src/nvim/testdir/runnvim.vim
+++ b/test/old/testdir/runnvim.vim
diff --git a/src/nvim/testdir/runtest.vim b/test/old/testdir/runtest.vim
index 3c5699af73..3c5699af73 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/test/old/testdir/runtest.vim
diff --git a/src/nvim/testdir/samples/memfile_test.c b/test/old/testdir/samples/memfile_test.c
index 73f67fb250..73f67fb250 100644
--- a/src/nvim/testdir/samples/memfile_test.c
+++ b/test/old/testdir/samples/memfile_test.c
diff --git a/src/nvim/testdir/samples/quickfix.txt b/test/old/testdir/samples/quickfix.txt
index 2de3835473..2de3835473 100644
--- a/src/nvim/testdir/samples/quickfix.txt
+++ b/test/old/testdir/samples/quickfix.txt
diff --git a/src/nvim/testdir/samples/re.freeze.txt b/test/old/testdir/samples/re.freeze.txt
index d768c23c5e..d768c23c5e 100644
--- a/src/nvim/testdir/samples/re.freeze.txt
+++ b/test/old/testdir/samples/re.freeze.txt
diff --git a/src/nvim/testdir/sautest/autoload/foo.vim b/test/old/testdir/sautest/autoload/foo.vim
index 21d33a0f4d..21d33a0f4d 100644
--- a/src/nvim/testdir/sautest/autoload/foo.vim
+++ b/test/old/testdir/sautest/autoload/foo.vim
diff --git a/src/nvim/testdir/sautest/autoload/footest.vim b/test/old/testdir/sautest/autoload/footest.vim
index 1e78963a10..1e78963a10 100644
--- a/src/nvim/testdir/sautest/autoload/footest.vim
+++ b/test/old/testdir/sautest/autoload/footest.vim
diff --git a/src/nvim/testdir/sautest/autoload/globone.vim b/test/old/testdir/sautest/autoload/globone.vim
index 98c9a10582..98c9a10582 100644
--- a/src/nvim/testdir/sautest/autoload/globone.vim
+++ b/test/old/testdir/sautest/autoload/globone.vim
diff --git a/src/nvim/testdir/sautest/autoload/globtwo.vim b/test/old/testdir/sautest/autoload/globtwo.vim
index 98c9a10582..98c9a10582 100644
--- a/src/nvim/testdir/sautest/autoload/globtwo.vim
+++ b/test/old/testdir/sautest/autoload/globtwo.vim
diff --git a/src/nvim/testdir/sautest/autoload/sourced.vim b/test/old/testdir/sautest/autoload/sourced.vim
index f69f00cb53..f69f00cb53 100644
--- a/src/nvim/testdir/sautest/autoload/sourced.vim
+++ b/test/old/testdir/sautest/autoload/sourced.vim
diff --git a/src/nvim/testdir/screendump.vim b/test/old/testdir/screendump.vim
index 8afff1da91..8afff1da91 100644
--- a/src/nvim/testdir/screendump.vim
+++ b/test/old/testdir/screendump.vim
diff --git a/src/nvim/testdir/script_util.vim b/test/old/testdir/script_util.vim
index 28d6a621d6..28d6a621d6 100644
--- a/src/nvim/testdir/script_util.vim
+++ b/test/old/testdir/script_util.vim
diff --git a/src/nvim/testdir/setup.vim b/test/old/testdir/setup.vim
index 25ac2d1239..25ac2d1239 100644
--- a/src/nvim/testdir/setup.vim
+++ b/test/old/testdir/setup.vim
diff --git a/src/nvim/testdir/shared.vim b/test/old/testdir/shared.vim
index 33f6d9a2d0..33f6d9a2d0 100644
--- a/src/nvim/testdir/shared.vim
+++ b/test/old/testdir/shared.vim
diff --git a/src/nvim/testdir/suite.sh b/test/old/testdir/suite.sh
index bf5a16fd89..bf5a16fd89 100644
--- a/src/nvim/testdir/suite.sh
+++ b/test/old/testdir/suite.sh
diff --git a/src/nvim/testdir/summarize.vim b/test/old/testdir/summarize.vim
index da5856a2e7..da5856a2e7 100644
--- a/src/nvim/testdir/summarize.vim
+++ b/test/old/testdir/summarize.vim
diff --git a/src/nvim/testdir/term_util.vim b/test/old/testdir/term_util.vim
index 5ff09e25b4..5ff09e25b4 100644
--- a/src/nvim/testdir/term_util.vim
+++ b/test/old/testdir/term_util.vim
diff --git a/src/nvim/testdir/test.sh b/test/old/testdir/test.sh
index affdc308d1..affdc308d1 100644
--- a/src/nvim/testdir/test.sh
+++ b/test/old/testdir/test.sh
diff --git a/src/nvim/testdir/test1.in b/test/old/testdir/test1.in
index 272500cd25..272500cd25 100644
--- a/src/nvim/testdir/test1.in
+++ b/test/old/testdir/test1.in
diff --git a/src/nvim/testdir/test1.ok b/test/old/testdir/test1.ok
index 90bfcb5106..90bfcb5106 100644
--- a/src/nvim/testdir/test1.ok
+++ b/test/old/testdir/test1.ok
diff --git a/src/nvim/testdir/test_alot.vim b/test/old/testdir/test_alot.vim
index a3d240f27e..a3d240f27e 100644
--- a/src/nvim/testdir/test_alot.vim
+++ b/test/old/testdir/test_alot.vim
diff --git a/src/nvim/testdir/test_alot_latin.vim b/test/old/testdir/test_alot_latin.vim
index 23a404cac1..23a404cac1 100644
--- a/src/nvim/testdir/test_alot_latin.vim
+++ b/test/old/testdir/test_alot_latin.vim
diff --git a/src/nvim/testdir/test_alot_utf8.vim b/test/old/testdir/test_alot_utf8.vim
index 77f5ede4c8..77f5ede4c8 100644
--- a/src/nvim/testdir/test_alot_utf8.vim
+++ b/test/old/testdir/test_alot_utf8.vim
diff --git a/src/nvim/testdir/test_arabic.vim b/test/old/testdir/test_arabic.vim
index 272937387d..272937387d 100644
--- a/src/nvim/testdir/test_arabic.vim
+++ b/test/old/testdir/test_arabic.vim
diff --git a/src/nvim/testdir/test_arglist.vim b/test/old/testdir/test_arglist.vim
index fb8b17cd16..fb8b17cd16 100644
--- a/src/nvim/testdir/test_arglist.vim
+++ b/test/old/testdir/test_arglist.vim
diff --git a/src/nvim/testdir/test_assert.vim b/test/old/testdir/test_assert.vim
index 431908e95c..431908e95c 100644
--- a/src/nvim/testdir/test_assert.vim
+++ b/test/old/testdir/test_assert.vim
diff --git a/src/nvim/testdir/test_autochdir.vim b/test/old/testdir/test_autochdir.vim
index a8810047a0..a8810047a0 100644
--- a/src/nvim/testdir/test_autochdir.vim
+++ b/test/old/testdir/test_autochdir.vim
diff --git a/src/nvim/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim
index 6d7f1649b3..6d7f1649b3 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/test/old/testdir/test_autocmd.vim
diff --git a/src/nvim/testdir/test_autoload.vim b/test/old/testdir/test_autoload.vim
index e89fe3943b..e89fe3943b 100644
--- a/src/nvim/testdir/test_autoload.vim
+++ b/test/old/testdir/test_autoload.vim
diff --git a/src/nvim/testdir/test_backspace_opt.vim b/test/old/testdir/test_backspace_opt.vim
index 59e94d2898..59e94d2898 100644
--- a/src/nvim/testdir/test_backspace_opt.vim
+++ b/test/old/testdir/test_backspace_opt.vim
diff --git a/src/nvim/testdir/test_backup.vim b/test/old/testdir/test_backup.vim
index d304773da4..d304773da4 100644
--- a/src/nvim/testdir/test_backup.vim
+++ b/test/old/testdir/test_backup.vim
diff --git a/src/nvim/testdir/test_behave.vim b/test/old/testdir/test_behave.vim
index c26bfe7ce3..c26bfe7ce3 100644
--- a/src/nvim/testdir/test_behave.vim
+++ b/test/old/testdir/test_behave.vim
diff --git a/src/nvim/testdir/test_blob.vim b/test/old/testdir/test_blob.vim
index 920ceb826d..920ceb826d 100644
--- a/src/nvim/testdir/test_blob.vim
+++ b/test/old/testdir/test_blob.vim
diff --git a/src/nvim/testdir/test_blockedit.vim b/test/old/testdir/test_blockedit.vim
index 7b56b1554f..7b56b1554f 100644
--- a/src/nvim/testdir/test_blockedit.vim
+++ b/test/old/testdir/test_blockedit.vim
diff --git a/src/nvim/testdir/test_breakindent.vim b/test/old/testdir/test_breakindent.vim
index 0d1753182e..0d1753182e 100644
--- a/src/nvim/testdir/test_breakindent.vim
+++ b/test/old/testdir/test_breakindent.vim
diff --git a/src/nvim/testdir/test_buffer.vim b/test/old/testdir/test_buffer.vim
index 98eba83f73..98eba83f73 100644
--- a/src/nvim/testdir/test_buffer.vim
+++ b/test/old/testdir/test_buffer.vim
diff --git a/src/nvim/testdir/test_bufline.vim b/test/old/testdir/test_bufline.vim
index 0468025f55..0468025f55 100644
--- a/src/nvim/testdir/test_bufline.vim
+++ b/test/old/testdir/test_bufline.vim
diff --git a/src/nvim/testdir/test_bufwintabinfo.vim b/test/old/testdir/test_bufwintabinfo.vim
index 326aefb731..326aefb731 100644
--- a/src/nvim/testdir/test_bufwintabinfo.vim
+++ b/test/old/testdir/test_bufwintabinfo.vim
diff --git a/src/nvim/testdir/test_cd.vim b/test/old/testdir/test_cd.vim
index 2b37f2c7c0..2b37f2c7c0 100644
--- a/src/nvim/testdir/test_cd.vim
+++ b/test/old/testdir/test_cd.vim
diff --git a/src/nvim/testdir/test_cdo.vim b/test/old/testdir/test_cdo.vim
index dbed7df4ac..dbed7df4ac 100644
--- a/src/nvim/testdir/test_cdo.vim
+++ b/test/old/testdir/test_cdo.vim
diff --git a/src/nvim/testdir/test_changedtick.vim b/test/old/testdir/test_changedtick.vim
index c789cdc1bc..c789cdc1bc 100644
--- a/src/nvim/testdir/test_changedtick.vim
+++ b/test/old/testdir/test_changedtick.vim
diff --git a/src/nvim/testdir/test_changelist.vim b/test/old/testdir/test_changelist.vim
index 3bb22a89b8..3bb22a89b8 100644
--- a/src/nvim/testdir/test_changelist.vim
+++ b/test/old/testdir/test_changelist.vim
diff --git a/src/nvim/testdir/test_charsearch.vim b/test/old/testdir/test_charsearch.vim
index f8f3e958ca..f8f3e958ca 100644
--- a/src/nvim/testdir/test_charsearch.vim
+++ b/test/old/testdir/test_charsearch.vim
diff --git a/src/nvim/testdir/test_charsearch_utf8.vim b/test/old/testdir/test_charsearch_utf8.vim
index 82a807ac5b..82a807ac5b 100644
--- a/src/nvim/testdir/test_charsearch_utf8.vim
+++ b/test/old/testdir/test_charsearch_utf8.vim
diff --git a/src/nvim/testdir/test_checkpath.vim b/test/old/testdir/test_checkpath.vim
index f6a3bbce08..f6a3bbce08 100644
--- a/src/nvim/testdir/test_checkpath.vim
+++ b/test/old/testdir/test_checkpath.vim
diff --git a/src/nvim/testdir/test_cindent.vim b/test/old/testdir/test_cindent.vim
index ccc8168c09..ccc8168c09 100644
--- a/src/nvim/testdir/test_cindent.vim
+++ b/test/old/testdir/test_cindent.vim
diff --git a/src/nvim/testdir/test_cjk_linebreak.vim b/test/old/testdir/test_cjk_linebreak.vim
index dfaa8fa1af..dfaa8fa1af 100644
--- a/src/nvim/testdir/test_cjk_linebreak.vim
+++ b/test/old/testdir/test_cjk_linebreak.vim
diff --git a/src/nvim/testdir/test_clientserver.vim b/test/old/testdir/test_clientserver.vim
index d8b29f6c42..d8b29f6c42 100644
--- a/src/nvim/testdir/test_clientserver.vim
+++ b/test/old/testdir/test_clientserver.vim
diff --git a/src/nvim/testdir/test_close_count.vim b/test/old/testdir/test_close_count.vim
index 1f9adba32d..1f9adba32d 100644
--- a/src/nvim/testdir/test_close_count.vim
+++ b/test/old/testdir/test_close_count.vim
diff --git a/src/nvim/testdir/test_cmdline.vim b/test/old/testdir/test_cmdline.vim
index 1dceb43e5d..1dceb43e5d 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/test/old/testdir/test_cmdline.vim
diff --git a/src/nvim/testdir/test_command_count.vim b/test/old/testdir/test_command_count.vim
index 55b230373f..55b230373f 100644
--- a/src/nvim/testdir/test_command_count.vim
+++ b/test/old/testdir/test_command_count.vim
diff --git a/src/nvim/testdir/test_comments.vim b/test/old/testdir/test_comments.vim
index c34b85c42d..c34b85c42d 100644
--- a/src/nvim/testdir/test_comments.vim
+++ b/test/old/testdir/test_comments.vim
diff --git a/src/nvim/testdir/test_comparators.vim b/test/old/testdir/test_comparators.vim
index 87be006cf2..87be006cf2 100644
--- a/src/nvim/testdir/test_comparators.vim
+++ b/test/old/testdir/test_comparators.vim
diff --git a/src/nvim/testdir/test_compiler.vim b/test/old/testdir/test_compiler.vim
index ec7d143030..ec7d143030 100644
--- a/src/nvim/testdir/test_compiler.vim
+++ b/test/old/testdir/test_compiler.vim
diff --git a/src/nvim/testdir/test_conceal.vim b/test/old/testdir/test_conceal.vim
index bffc2f49d3..bffc2f49d3 100644
--- a/src/nvim/testdir/test_conceal.vim
+++ b/test/old/testdir/test_conceal.vim
diff --git a/src/nvim/testdir/test_const.vim b/test/old/testdir/test_const.vim
index 4a6c8779dd..4a6c8779dd 100644
--- a/src/nvim/testdir/test_const.vim
+++ b/test/old/testdir/test_const.vim
diff --git a/src/nvim/testdir/test_cpoptions.vim b/test/old/testdir/test_cpoptions.vim
index 846671a646..846671a646 100644
--- a/src/nvim/testdir/test_cpoptions.vim
+++ b/test/old/testdir/test_cpoptions.vim
diff --git a/src/nvim/testdir/test_cursor_func.vim b/test/old/testdir/test_cursor_func.vim
index bb8e7cd5c5..bb8e7cd5c5 100644
--- a/src/nvim/testdir/test_cursor_func.vim
+++ b/test/old/testdir/test_cursor_func.vim
diff --git a/src/nvim/testdir/test_cursorline.vim b/test/old/testdir/test_cursorline.vim
index 70f39a8601..70f39a8601 100644
--- a/src/nvim/testdir/test_cursorline.vim
+++ b/test/old/testdir/test_cursorline.vim
diff --git a/src/nvim/testdir/test_curswant.vim b/test/old/testdir/test_curswant.vim
index e54cd4b280..e54cd4b280 100644
--- a/src/nvim/testdir/test_curswant.vim
+++ b/test/old/testdir/test_curswant.vim
diff --git a/src/nvim/testdir/test_debugger.vim b/test/old/testdir/test_debugger.vim
index f5177c8fb2..f5177c8fb2 100644
--- a/src/nvim/testdir/test_debugger.vim
+++ b/test/old/testdir/test_debugger.vim
diff --git a/src/nvim/testdir/test_delete.vim b/test/old/testdir/test_delete.vim
index 6b49f153c6..6b49f153c6 100644
--- a/src/nvim/testdir/test_delete.vim
+++ b/test/old/testdir/test_delete.vim
diff --git a/src/nvim/testdir/test_diffmode.vim b/test/old/testdir/test_diffmode.vim
index 0049398776..0049398776 100644
--- a/src/nvim/testdir/test_diffmode.vim
+++ b/test/old/testdir/test_diffmode.vim
diff --git a/src/nvim/testdir/test_digraph.vim b/test/old/testdir/test_digraph.vim
index f08dff8605..f08dff8605 100644
--- a/src/nvim/testdir/test_digraph.vim
+++ b/test/old/testdir/test_digraph.vim
diff --git a/src/nvim/testdir/test_display.vim b/test/old/testdir/test_display.vim
index b642f39c9f..b642f39c9f 100644
--- a/src/nvim/testdir/test_display.vim
+++ b/test/old/testdir/test_display.vim
diff --git a/src/nvim/testdir/test_edit.vim b/test/old/testdir/test_edit.vim
index e4c21d9932..e4c21d9932 100644
--- a/src/nvim/testdir/test_edit.vim
+++ b/test/old/testdir/test_edit.vim
diff --git a/src/nvim/testdir/test_environ.vim b/test/old/testdir/test_environ.vim
index b5dbdce104..b5dbdce104 100644
--- a/src/nvim/testdir/test_environ.vim
+++ b/test/old/testdir/test_environ.vim
diff --git a/src/nvim/testdir/test_erasebackword.vim b/test/old/testdir/test_erasebackword.vim
index 9522ec2cd6..9522ec2cd6 100644
--- a/src/nvim/testdir/test_erasebackword.vim
+++ b/test/old/testdir/test_erasebackword.vim
diff --git a/src/nvim/testdir/test_escaped_glob.vim b/test/old/testdir/test_escaped_glob.vim
index 9f53c76a2c..9f53c76a2c 100644
--- a/src/nvim/testdir/test_escaped_glob.vim
+++ b/test/old/testdir/test_escaped_glob.vim
diff --git a/src/nvim/testdir/test_eval_stuff.vim b/test/old/testdir/test_eval_stuff.vim
index 46482c34a1..46482c34a1 100644
--- a/src/nvim/testdir/test_eval_stuff.vim
+++ b/test/old/testdir/test_eval_stuff.vim
diff --git a/src/nvim/testdir/test_ex_equal.vim b/test/old/testdir/test_ex_equal.vim
index 05ad276836..05ad276836 100644
--- a/src/nvim/testdir/test_ex_equal.vim
+++ b/test/old/testdir/test_ex_equal.vim
diff --git a/src/nvim/testdir/test_ex_mode.vim b/test/old/testdir/test_ex_mode.vim
index 93100732ed..93100732ed 100644
--- a/src/nvim/testdir/test_ex_mode.vim
+++ b/test/old/testdir/test_ex_mode.vim
diff --git a/src/nvim/testdir/test_ex_undo.vim b/test/old/testdir/test_ex_undo.vim
index 44feb3680a..44feb3680a 100644
--- a/src/nvim/testdir/test_ex_undo.vim
+++ b/test/old/testdir/test_ex_undo.vim
diff --git a/src/nvim/testdir/test_ex_z.vim b/test/old/testdir/test_ex_z.vim
index 481747ce84..481747ce84 100644
--- a/src/nvim/testdir/test_ex_z.vim
+++ b/test/old/testdir/test_ex_z.vim
diff --git a/src/nvim/testdir/test_excmd.vim b/test/old/testdir/test_excmd.vim
index 44bed890f5..44bed890f5 100644
--- a/src/nvim/testdir/test_excmd.vim
+++ b/test/old/testdir/test_excmd.vim
diff --git a/src/nvim/testdir/test_exec_while_if.vim b/test/old/testdir/test_exec_while_if.vim
index 3f13b09945..3f13b09945 100644
--- a/src/nvim/testdir/test_exec_while_if.vim
+++ b/test/old/testdir/test_exec_while_if.vim
diff --git a/src/nvim/testdir/test_execute_func.vim b/test/old/testdir/test_execute_func.vim
index 16cc20e9a7..16cc20e9a7 100644
--- a/src/nvim/testdir/test_execute_func.vim
+++ b/test/old/testdir/test_execute_func.vim
diff --git a/src/nvim/testdir/test_exists.vim b/test/old/testdir/test_exists.vim
index 62c66192ef..62c66192ef 100644
--- a/src/nvim/testdir/test_exists.vim
+++ b/test/old/testdir/test_exists.vim
diff --git a/src/nvim/testdir/test_exists_autocmd.vim b/test/old/testdir/test_exists_autocmd.vim
index 7e44a72653..7e44a72653 100644
--- a/src/nvim/testdir/test_exists_autocmd.vim
+++ b/test/old/testdir/test_exists_autocmd.vim
diff --git a/src/nvim/testdir/test_exit.vim b/test/old/testdir/test_exit.vim
index 6dbfb7047c..6dbfb7047c 100644
--- a/src/nvim/testdir/test_exit.vim
+++ b/test/old/testdir/test_exit.vim
diff --git a/src/nvim/testdir/test_expand.vim b/test/old/testdir/test_expand.vim
index 4f5bb67d21..4f5bb67d21 100644
--- a/src/nvim/testdir/test_expand.vim
+++ b/test/old/testdir/test_expand.vim
diff --git a/src/nvim/testdir/test_expand_func.vim b/test/old/testdir/test_expand_func.vim
index 454d76f0aa..454d76f0aa 100644
--- a/src/nvim/testdir/test_expand_func.vim
+++ b/test/old/testdir/test_expand_func.vim
diff --git a/src/nvim/testdir/test_expr.vim b/test/old/testdir/test_expr.vim
index 47f7f5eb0e..47f7f5eb0e 100644
--- a/src/nvim/testdir/test_expr.vim
+++ b/test/old/testdir/test_expr.vim
diff --git a/src/nvim/testdir/test_expr_utf8.vim b/test/old/testdir/test_expr_utf8.vim
index fad725d2e5..fad725d2e5 100644
--- a/src/nvim/testdir/test_expr_utf8.vim
+++ b/test/old/testdir/test_expr_utf8.vim
diff --git a/src/nvim/testdir/test_file_perm.vim b/test/old/testdir/test_file_perm.vim
index 1cb09e8647..1cb09e8647 100644
--- a/src/nvim/testdir/test_file_perm.vim
+++ b/test/old/testdir/test_file_perm.vim
diff --git a/src/nvim/testdir/test_file_size.vim b/test/old/testdir/test_file_size.vim
index 3e78a7b23c..3e78a7b23c 100644
--- a/src/nvim/testdir/test_file_size.vim
+++ b/test/old/testdir/test_file_size.vim
diff --git a/src/nvim/testdir/test_filechanged.vim b/test/old/testdir/test_filechanged.vim
index fef0eb732f..fef0eb732f 100644
--- a/src/nvim/testdir/test_filechanged.vim
+++ b/test/old/testdir/test_filechanged.vim
diff --git a/src/nvim/testdir/test_fileformat.vim b/test/old/testdir/test_fileformat.vim
index 8d727a68c4..8d727a68c4 100644
--- a/src/nvim/testdir/test_fileformat.vim
+++ b/test/old/testdir/test_fileformat.vim
diff --git a/src/nvim/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index eb00cb98ca..eb00cb98ca 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
diff --git a/src/nvim/testdir/test_filter_cmd.vim b/test/old/testdir/test_filter_cmd.vim
index dae164b11c..dae164b11c 100644
--- a/src/nvim/testdir/test_filter_cmd.vim
+++ b/test/old/testdir/test_filter_cmd.vim
diff --git a/src/nvim/testdir/test_filter_map.vim b/test/old/testdir/test_filter_map.vim
index c75177ea39..c75177ea39 100644
--- a/src/nvim/testdir/test_filter_map.vim
+++ b/test/old/testdir/test_filter_map.vim
diff --git a/src/nvim/testdir/test_find_complete.vim b/test/old/testdir/test_find_complete.vim
index 32ca9672ef..32ca9672ef 100644
--- a/src/nvim/testdir/test_find_complete.vim
+++ b/test/old/testdir/test_find_complete.vim
diff --git a/src/nvim/testdir/test_findfile.vim b/test/old/testdir/test_findfile.vim
index 0f4b30aec2..0f4b30aec2 100644
--- a/src/nvim/testdir/test_findfile.vim
+++ b/test/old/testdir/test_findfile.vim
diff --git a/src/nvim/testdir/test_fixeol.vim b/test/old/testdir/test_fixeol.vim
index 41d47d6a06..41d47d6a06 100644
--- a/src/nvim/testdir/test_fixeol.vim
+++ b/test/old/testdir/test_fixeol.vim
diff --git a/src/nvim/testdir/test_flatten.vim b/test/old/testdir/test_flatten.vim
index aa91060313..aa91060313 100644
--- a/src/nvim/testdir/test_flatten.vim
+++ b/test/old/testdir/test_flatten.vim
diff --git a/src/nvim/testdir/test_float_func.vim b/test/old/testdir/test_float_func.vim
index 902a011a9d..902a011a9d 100644
--- a/src/nvim/testdir/test_float_func.vim
+++ b/test/old/testdir/test_float_func.vim
diff --git a/src/nvim/testdir/test_fnameescape.vim b/test/old/testdir/test_fnameescape.vim
index cdb96ba5ff..cdb96ba5ff 100644
--- a/src/nvim/testdir/test_fnameescape.vim
+++ b/test/old/testdir/test_fnameescape.vim
diff --git a/src/nvim/testdir/test_fnamemodify.vim b/test/old/testdir/test_fnamemodify.vim
index 258a2093bd..258a2093bd 100644
--- a/src/nvim/testdir/test_fnamemodify.vim
+++ b/test/old/testdir/test_fnamemodify.vim
diff --git a/src/nvim/testdir/test_fold.vim b/test/old/testdir/test_fold.vim
index 2f5c93ca2d..2f5c93ca2d 100644
--- a/src/nvim/testdir/test_fold.vim
+++ b/test/old/testdir/test_fold.vim
diff --git a/src/nvim/testdir/test_functions.vim b/test/old/testdir/test_functions.vim
index 4ed1187a19..4ed1187a19 100644
--- a/src/nvim/testdir/test_functions.vim
+++ b/test/old/testdir/test_functions.vim
diff --git a/src/nvim/testdir/test_ga.vim b/test/old/testdir/test_ga.vim
index ce31edfc7a..ce31edfc7a 100644
--- a/src/nvim/testdir/test_ga.vim
+++ b/test/old/testdir/test_ga.vim
diff --git a/src/nvim/testdir/test_getcwd.vim b/test/old/testdir/test_getcwd.vim
index 073f8303dc..073f8303dc 100644
--- a/src/nvim/testdir/test_getcwd.vim
+++ b/test/old/testdir/test_getcwd.vim
diff --git a/src/nvim/testdir/test_getvar.vim b/test/old/testdir/test_getvar.vim
index e6b6341fce..e6b6341fce 100644
--- a/src/nvim/testdir/test_getvar.vim
+++ b/test/old/testdir/test_getvar.vim
diff --git a/src/nvim/testdir/test_gf.vim b/test/old/testdir/test_gf.vim
index f09dbd72ce..f09dbd72ce 100644
--- a/src/nvim/testdir/test_gf.vim
+++ b/test/old/testdir/test_gf.vim
diff --git a/src/nvim/testdir/test_glob2regpat.vim b/test/old/testdir/test_glob2regpat.vim
index a423a4a9f0..a423a4a9f0 100644
--- a/src/nvim/testdir/test_glob2regpat.vim
+++ b/test/old/testdir/test_glob2regpat.vim
diff --git a/src/nvim/testdir/test_global.vim b/test/old/testdir/test_global.vim
index 44a8784348..44a8784348 100644
--- a/src/nvim/testdir/test_global.vim
+++ b/test/old/testdir/test_global.vim
diff --git a/src/nvim/testdir/test_gn.vim b/test/old/testdir/test_gn.vim
index c4a41a6742..c4a41a6742 100644
--- a/src/nvim/testdir/test_gn.vim
+++ b/test/old/testdir/test_gn.vim
diff --git a/src/nvim/testdir/test_goto.vim b/test/old/testdir/test_goto.vim
index 6d029ffda2..6d029ffda2 100644
--- a/src/nvim/testdir/test_goto.vim
+++ b/test/old/testdir/test_goto.vim
diff --git a/src/nvim/testdir/test_gui.vim b/test/old/testdir/test_gui.vim
index c3f1f3163a..c3f1f3163a 100644
--- a/src/nvim/testdir/test_gui.vim
+++ b/test/old/testdir/test_gui.vim
diff --git a/src/nvim/testdir/test_help.vim b/test/old/testdir/test_help.vim
index 08dd3dcb9a..08dd3dcb9a 100644
--- a/src/nvim/testdir/test_help.vim
+++ b/test/old/testdir/test_help.vim
diff --git a/src/nvim/testdir/test_help_tagjump.vim b/test/old/testdir/test_help_tagjump.vim
index eae1a241e3..eae1a241e3 100644
--- a/src/nvim/testdir/test_help_tagjump.vim
+++ b/test/old/testdir/test_help_tagjump.vim
diff --git a/src/nvim/testdir/test_hide.vim b/test/old/testdir/test_hide.vim
index b3ce395523..b3ce395523 100644
--- a/src/nvim/testdir/test_hide.vim
+++ b/test/old/testdir/test_hide.vim
diff --git a/src/nvim/testdir/test_highlight.vim b/test/old/testdir/test_highlight.vim
index 8a102f2e65..8a102f2e65 100644
--- a/src/nvim/testdir/test_highlight.vim
+++ b/test/old/testdir/test_highlight.vim
diff --git a/src/nvim/testdir/test_history.vim b/test/old/testdir/test_history.vim
index f1c31dee04..f1c31dee04 100644
--- a/src/nvim/testdir/test_history.vim
+++ b/test/old/testdir/test_history.vim
diff --git a/src/nvim/testdir/test_hlsearch.vim b/test/old/testdir/test_hlsearch.vim
index 043d378a39..043d378a39 100644
--- a/src/nvim/testdir/test_hlsearch.vim
+++ b/test/old/testdir/test_hlsearch.vim
diff --git a/src/nvim/testdir/test_increment.vim b/test/old/testdir/test_increment.vim
index 433b2b4471..433b2b4471 100644
--- a/src/nvim/testdir/test_increment.vim
+++ b/test/old/testdir/test_increment.vim
diff --git a/src/nvim/testdir/test_increment_dbcs.vim b/test/old/testdir/test_increment_dbcs.vim
index e5d5ccffb3..e5d5ccffb3 100644
--- a/src/nvim/testdir/test_increment_dbcs.vim
+++ b/test/old/testdir/test_increment_dbcs.vim
diff --git a/src/nvim/testdir/test_indent.vim b/test/old/testdir/test_indent.vim
index 3b5b643177..3b5b643177 100644
--- a/src/nvim/testdir/test_indent.vim
+++ b/test/old/testdir/test_indent.vim
diff --git a/src/nvim/testdir/test_input.vim b/test/old/testdir/test_input.vim
index 3b1e2eb2df..3b1e2eb2df 100644
--- a/src/nvim/testdir/test_input.vim
+++ b/test/old/testdir/test_input.vim
diff --git a/src/nvim/testdir/test_ins_complete.vim b/test/old/testdir/test_ins_complete.vim
index af0856331d..af0856331d 100644
--- a/src/nvim/testdir/test_ins_complete.vim
+++ b/test/old/testdir/test_ins_complete.vim
diff --git a/src/nvim/testdir/test_ins_complete_no_halt.vim b/test/old/testdir/test_ins_complete_no_halt.vim
index e12925daa9..e12925daa9 100644
--- a/src/nvim/testdir/test_ins_complete_no_halt.vim
+++ b/test/old/testdir/test_ins_complete_no_halt.vim
diff --git a/src/nvim/testdir/test_interrupt.vim b/test/old/testdir/test_interrupt.vim
index aa7f634302..aa7f634302 100644
--- a/src/nvim/testdir/test_interrupt.vim
+++ b/test/old/testdir/test_interrupt.vim
diff --git a/src/nvim/testdir/test_join.vim b/test/old/testdir/test_join.vim
index 1f7a0825a5..1f7a0825a5 100644
--- a/src/nvim/testdir/test_join.vim
+++ b/test/old/testdir/test_join.vim
diff --git a/src/nvim/testdir/test_jumplist.vim b/test/old/testdir/test_jumplist.vim
index 91ad940e18..91ad940e18 100644
--- a/src/nvim/testdir/test_jumplist.vim
+++ b/test/old/testdir/test_jumplist.vim
diff --git a/src/nvim/testdir/test_lambda.vim b/test/old/testdir/test_lambda.vim
index 025eb016a8..025eb016a8 100644
--- a/src/nvim/testdir/test_lambda.vim
+++ b/test/old/testdir/test_lambda.vim
diff --git a/src/nvim/testdir/test_langmap.vim b/test/old/testdir/test_langmap.vim
index aaed77e109..aaed77e109 100644
--- a/src/nvim/testdir/test_langmap.vim
+++ b/test/old/testdir/test_langmap.vim
diff --git a/src/nvim/testdir/test_largefile.vim b/test/old/testdir/test_largefile.vim
index fa32b7fb5c..fa32b7fb5c 100644
--- a/src/nvim/testdir/test_largefile.vim
+++ b/test/old/testdir/test_largefile.vim
diff --git a/src/nvim/testdir/test_let.vim b/test/old/testdir/test_let.vim
index 35745e9c6a..35745e9c6a 100644
--- a/src/nvim/testdir/test_let.vim
+++ b/test/old/testdir/test_let.vim
diff --git a/src/nvim/testdir/test_lineending.vim b/test/old/testdir/test_lineending.vim
index 5be3be8db3..5be3be8db3 100644
--- a/src/nvim/testdir/test_lineending.vim
+++ b/test/old/testdir/test_lineending.vim
diff --git a/src/nvim/testdir/test_lispindent.vim b/test/old/testdir/test_lispindent.vim
index 2d6060bba3..2d6060bba3 100644
--- a/src/nvim/testdir/test_lispindent.vim
+++ b/test/old/testdir/test_lispindent.vim
diff --git a/src/nvim/testdir/test_listchars.vim b/test/old/testdir/test_listchars.vim
index eed4d7e30c..eed4d7e30c 100644
--- a/src/nvim/testdir/test_listchars.vim
+++ b/test/old/testdir/test_listchars.vim
diff --git a/src/nvim/testdir/test_listdict.vim b/test/old/testdir/test_listdict.vim
index a6a1c736c4..a6a1c736c4 100644
--- a/src/nvim/testdir/test_listdict.vim
+++ b/test/old/testdir/test_listdict.vim
diff --git a/src/nvim/testdir/test_listlbr.vim b/test/old/testdir/test_listlbr.vim
index a746779e73..a746779e73 100644
--- a/src/nvim/testdir/test_listlbr.vim
+++ b/test/old/testdir/test_listlbr.vim
diff --git a/src/nvim/testdir/test_listlbr_utf8.vim b/test/old/testdir/test_listlbr_utf8.vim
index df1ed78119..df1ed78119 100644
--- a/src/nvim/testdir/test_listlbr_utf8.vim
+++ b/test/old/testdir/test_listlbr_utf8.vim
diff --git a/src/nvim/testdir/test_makeencoding.py b/test/old/testdir/test_makeencoding.py
index f6dc0f8d1c..f6dc0f8d1c 100644
--- a/src/nvim/testdir/test_makeencoding.py
+++ b/test/old/testdir/test_makeencoding.py
diff --git a/src/nvim/testdir/test_makeencoding.vim b/test/old/testdir/test_makeencoding.vim
index e297bdc228..e297bdc228 100644
--- a/src/nvim/testdir/test_makeencoding.vim
+++ b/test/old/testdir/test_makeencoding.vim
diff --git a/src/nvim/testdir/test_maparg.vim b/test/old/testdir/test_maparg.vim
index f903f5b934..f903f5b934 100644
--- a/src/nvim/testdir/test_maparg.vim
+++ b/test/old/testdir/test_maparg.vim
diff --git a/src/nvim/testdir/test_mapping.vim b/test/old/testdir/test_mapping.vim
index e25c3c333e..e25c3c333e 100644
--- a/src/nvim/testdir/test_mapping.vim
+++ b/test/old/testdir/test_mapping.vim
diff --git a/src/nvim/testdir/test_marks.vim b/test/old/testdir/test_marks.vim
index a7ccca498c..a7ccca498c 100644
--- a/src/nvim/testdir/test_marks.vim
+++ b/test/old/testdir/test_marks.vim
diff --git a/src/nvim/testdir/test_match.vim b/test/old/testdir/test_match.vim
index 600b6132a9..600b6132a9 100644
--- a/src/nvim/testdir/test_match.vim
+++ b/test/old/testdir/test_match.vim
diff --git a/src/nvim/testdir/test_matchadd_conceal.vim b/test/old/testdir/test_matchadd_conceal.vim
index 1b5fc8313f..1b5fc8313f 100644
--- a/src/nvim/testdir/test_matchadd_conceal.vim
+++ b/test/old/testdir/test_matchadd_conceal.vim
diff --git a/src/nvim/testdir/test_matchadd_conceal_utf8.vim b/test/old/testdir/test_matchadd_conceal_utf8.vim
index f33c7f694c..f33c7f694c 100644
--- a/src/nvim/testdir/test_matchadd_conceal_utf8.vim
+++ b/test/old/testdir/test_matchadd_conceal_utf8.vim
diff --git a/src/nvim/testdir/test_matchfuzzy.vim b/test/old/testdir/test_matchfuzzy.vim
index b46550fbc3..b46550fbc3 100644
--- a/src/nvim/testdir/test_matchfuzzy.vim
+++ b/test/old/testdir/test_matchfuzzy.vim
diff --git a/src/nvim/testdir/test_menu.vim b/test/old/testdir/test_menu.vim
index a1121632e6..a1121632e6 100644
--- a/src/nvim/testdir/test_menu.vim
+++ b/test/old/testdir/test_menu.vim
diff --git a/src/nvim/testdir/test_messages.vim b/test/old/testdir/test_messages.vim
index bfdebdac79..bfdebdac79 100644
--- a/src/nvim/testdir/test_messages.vim
+++ b/test/old/testdir/test_messages.vim
diff --git a/src/nvim/testdir/test_method.vim b/test/old/testdir/test_method.vim
index ca3b736429..ca3b736429 100644
--- a/src/nvim/testdir/test_method.vim
+++ b/test/old/testdir/test_method.vim
diff --git a/src/nvim/testdir/test_mksession.vim b/test/old/testdir/test_mksession.vim
index 972397cb91..972397cb91 100644
--- a/src/nvim/testdir/test_mksession.vim
+++ b/test/old/testdir/test_mksession.vim
diff --git a/src/nvim/testdir/test_mksession_utf8.vim b/test/old/testdir/test_mksession_utf8.vim
index 4e593cc21a..4e593cc21a 100644
--- a/src/nvim/testdir/test_mksession_utf8.vim
+++ b/test/old/testdir/test_mksession_utf8.vim
diff --git a/src/nvim/testdir/test_modeline.vim b/test/old/testdir/test_modeline.vim
index 613722fdbd..613722fdbd 100644
--- a/src/nvim/testdir/test_modeline.vim
+++ b/test/old/testdir/test_modeline.vim
diff --git a/src/nvim/testdir/test_move.vim b/test/old/testdir/test_move.vim
index 40d75d887e..40d75d887e 100644
--- a/src/nvim/testdir/test_move.vim
+++ b/test/old/testdir/test_move.vim
diff --git a/src/nvim/testdir/test_nested_function.vim b/test/old/testdir/test_nested_function.vim
index afaaea6ceb..afaaea6ceb 100644
--- a/src/nvim/testdir/test_nested_function.vim
+++ b/test/old/testdir/test_nested_function.vim
diff --git a/src/nvim/testdir/test_normal.vim b/test/old/testdir/test_normal.vim
index 48e6bc5298..48e6bc5298 100644
--- a/src/nvim/testdir/test_normal.vim
+++ b/test/old/testdir/test_normal.vim
diff --git a/src/nvim/testdir/test_number.vim b/test/old/testdir/test_number.vim
index 521b0cf706..521b0cf706 100644
--- a/src/nvim/testdir/test_number.vim
+++ b/test/old/testdir/test_number.vim
diff --git a/src/nvim/testdir/test_options.vim b/test/old/testdir/test_options.vim
index b6b982e92e..b6b982e92e 100644
--- a/src/nvim/testdir/test_options.vim
+++ b/test/old/testdir/test_options.vim
diff --git a/src/nvim/testdir/test_packadd.vim b/test/old/testdir/test_packadd.vim
index 3121b3b4d1..3121b3b4d1 100644
--- a/src/nvim/testdir/test_packadd.vim
+++ b/test/old/testdir/test_packadd.vim
diff --git a/src/nvim/testdir/test_partial.vim b/test/old/testdir/test_partial.vim
index 3020668f1b..3020668f1b 100644
--- a/src/nvim/testdir/test_partial.vim
+++ b/test/old/testdir/test_partial.vim
diff --git a/src/nvim/testdir/test_paste.vim b/test/old/testdir/test_paste.vim
index 923f4f42a6..923f4f42a6 100644
--- a/src/nvim/testdir/test_paste.vim
+++ b/test/old/testdir/test_paste.vim
diff --git a/src/nvim/testdir/test_perl.vim b/test/old/testdir/test_perl.vim
index 558d0a5d6b..558d0a5d6b 100644
--- a/src/nvim/testdir/test_perl.vim
+++ b/test/old/testdir/test_perl.vim
diff --git a/src/nvim/testdir/test_plus_arg_edit.vim b/test/old/testdir/test_plus_arg_edit.vim
index c52044d064..c52044d064 100644
--- a/src/nvim/testdir/test_plus_arg_edit.vim
+++ b/test/old/testdir/test_plus_arg_edit.vim
diff --git a/src/nvim/testdir/test_popup.vim b/test/old/testdir/test_popup.vim
index 791cce4431..791cce4431 100644
--- a/src/nvim/testdir/test_popup.vim
+++ b/test/old/testdir/test_popup.vim
diff --git a/src/nvim/testdir/test_preview.vim b/test/old/testdir/test_preview.vim
index b7b908e761..b7b908e761 100644
--- a/src/nvim/testdir/test_preview.vim
+++ b/test/old/testdir/test_preview.vim
diff --git a/src/nvim/testdir/test_profile.vim b/test/old/testdir/test_profile.vim
index 9165f7bace..9165f7bace 100644
--- a/src/nvim/testdir/test_profile.vim
+++ b/test/old/testdir/test_profile.vim
diff --git a/src/nvim/testdir/test_prompt_buffer.vim b/test/old/testdir/test_prompt_buffer.vim
index b1288b4892..b1288b4892 100644
--- a/src/nvim/testdir/test_prompt_buffer.vim
+++ b/test/old/testdir/test_prompt_buffer.vim
diff --git a/src/nvim/testdir/test_put.vim b/test/old/testdir/test_put.vim
index 25fc5a2f04..25fc5a2f04 100644
--- a/src/nvim/testdir/test_put.vim
+++ b/test/old/testdir/test_put.vim
diff --git a/src/nvim/testdir/test_python2.vim b/test/old/testdir/test_python2.vim
index 745b7da086..745b7da086 100644
--- a/src/nvim/testdir/test_python2.vim
+++ b/test/old/testdir/test_python2.vim
diff --git a/src/nvim/testdir/test_python3.vim b/test/old/testdir/test_python3.vim
index 69f5f6dcc0..69f5f6dcc0 100644
--- a/src/nvim/testdir/test_python3.vim
+++ b/test/old/testdir/test_python3.vim
diff --git a/src/nvim/testdir/test_pyx2.vim b/test/old/testdir/test_pyx2.vim
index eee825fa9b..eee825fa9b 100644
--- a/src/nvim/testdir/test_pyx2.vim
+++ b/test/old/testdir/test_pyx2.vim
diff --git a/src/nvim/testdir/test_pyx3.vim b/test/old/testdir/test_pyx3.vim
index db39f5134a..db39f5134a 100644
--- a/src/nvim/testdir/test_pyx3.vim
+++ b/test/old/testdir/test_pyx3.vim
diff --git a/src/nvim/testdir/test_quickfix.vim b/test/old/testdir/test_quickfix.vim
index fedc486e62..fedc486e62 100644
--- a/src/nvim/testdir/test_quickfix.vim
+++ b/test/old/testdir/test_quickfix.vim
diff --git a/src/nvim/testdir/test_quotestar.vim b/test/old/testdir/test_quotestar.vim
index 6a6719da8b..6a6719da8b 100644
--- a/src/nvim/testdir/test_quotestar.vim
+++ b/test/old/testdir/test_quotestar.vim
diff --git a/src/nvim/testdir/test_random.vim b/test/old/testdir/test_random.vim
index 5fdbfe9cd8..5fdbfe9cd8 100644
--- a/src/nvim/testdir/test_random.vim
+++ b/test/old/testdir/test_random.vim
diff --git a/src/nvim/testdir/test_recover.vim b/test/old/testdir/test_recover.vim
index 92e22687af..92e22687af 100644
--- a/src/nvim/testdir/test_recover.vim
+++ b/test/old/testdir/test_recover.vim
diff --git a/src/nvim/testdir/test_regex_char_classes.vim b/test/old/testdir/test_regex_char_classes.vim
index db16f057c8..db16f057c8 100644
--- a/src/nvim/testdir/test_regex_char_classes.vim
+++ b/test/old/testdir/test_regex_char_classes.vim
diff --git a/src/nvim/testdir/test_regexp_latin.vim b/test/old/testdir/test_regexp_latin.vim
index ece6ae518e..ece6ae518e 100644
--- a/src/nvim/testdir/test_regexp_latin.vim
+++ b/test/old/testdir/test_regexp_latin.vim
diff --git a/src/nvim/testdir/test_regexp_utf8.vim b/test/old/testdir/test_regexp_utf8.vim
index 2253242a7c..2253242a7c 100644
--- a/src/nvim/testdir/test_regexp_utf8.vim
+++ b/test/old/testdir/test_regexp_utf8.vim
diff --git a/src/nvim/testdir/test_registers.vim b/test/old/testdir/test_registers.vim
index bbf1aa53b5..bbf1aa53b5 100644
--- a/src/nvim/testdir/test_registers.vim
+++ b/test/old/testdir/test_registers.vim
diff --git a/src/nvim/testdir/test_reltime.vim b/test/old/testdir/test_reltime.vim
index f4ce5de118..f4ce5de118 100644
--- a/src/nvim/testdir/test_reltime.vim
+++ b/test/old/testdir/test_reltime.vim
diff --git a/src/nvim/testdir/test_rename.vim b/test/old/testdir/test_rename.vim
index 5359b84923..5359b84923 100644
--- a/src/nvim/testdir/test_rename.vim
+++ b/test/old/testdir/test_rename.vim
diff --git a/src/nvim/testdir/test_retab.vim b/test/old/testdir/test_retab.vim
index a4f95053c0..a4f95053c0 100644
--- a/src/nvim/testdir/test_retab.vim
+++ b/test/old/testdir/test_retab.vim
diff --git a/src/nvim/testdir/test_ruby.vim b/test/old/testdir/test_ruby.vim
index 1fbf3392d9..1fbf3392d9 100644
--- a/src/nvim/testdir/test_ruby.vim
+++ b/test/old/testdir/test_ruby.vim
diff --git a/src/nvim/testdir/test_scriptnames.vim b/test/old/testdir/test_scriptnames.vim
index 44ec146666..44ec146666 100644
--- a/src/nvim/testdir/test_scriptnames.vim
+++ b/test/old/testdir/test_scriptnames.vim
diff --git a/src/nvim/testdir/test_scroll_opt.vim b/test/old/testdir/test_scroll_opt.vim
index 64f4ced470..64f4ced470 100644
--- a/src/nvim/testdir/test_scroll_opt.vim
+++ b/test/old/testdir/test_scroll_opt.vim
diff --git a/src/nvim/testdir/test_scrollbind.vim b/test/old/testdir/test_scrollbind.vim
index f67a559c60..f67a559c60 100644
--- a/src/nvim/testdir/test_scrollbind.vim
+++ b/test/old/testdir/test_scrollbind.vim
diff --git a/src/nvim/testdir/test_search.vim b/test/old/testdir/test_search.vim
index 885043accf..885043accf 100644
--- a/src/nvim/testdir/test_search.vim
+++ b/test/old/testdir/test_search.vim
diff --git a/src/nvim/testdir/test_search_stat.vim b/test/old/testdir/test_search_stat.vim
index 1b2d854829..1b2d854829 100644
--- a/src/nvim/testdir/test_search_stat.vim
+++ b/test/old/testdir/test_search_stat.vim
diff --git a/src/nvim/testdir/test_searchpos.vim b/test/old/testdir/test_searchpos.vim
index dd13c305c5..dd13c305c5 100644
--- a/src/nvim/testdir/test_searchpos.vim
+++ b/test/old/testdir/test_searchpos.vim
diff --git a/src/nvim/testdir/test_selectmode.vim b/test/old/testdir/test_selectmode.vim
index 041f0592f1..041f0592f1 100644
--- a/src/nvim/testdir/test_selectmode.vim
+++ b/test/old/testdir/test_selectmode.vim
diff --git a/src/nvim/testdir/test_set.vim b/test/old/testdir/test_set.vim
index 7215772a00..7215772a00 100644
--- a/src/nvim/testdir/test_set.vim
+++ b/test/old/testdir/test_set.vim
diff --git a/src/nvim/testdir/test_sha256.vim b/test/old/testdir/test_sha256.vim
index f6f430b04e..f6f430b04e 100644
--- a/src/nvim/testdir/test_sha256.vim
+++ b/test/old/testdir/test_sha256.vim
diff --git a/src/nvim/testdir/test_shell.vim b/test/old/testdir/test_shell.vim
index 8b9c7a5b12..8b9c7a5b12 100644
--- a/src/nvim/testdir/test_shell.vim
+++ b/test/old/testdir/test_shell.vim
diff --git a/src/nvim/testdir/test_shift.vim b/test/old/testdir/test_shift.vim
index ec357dac88..ec357dac88 100644
--- a/src/nvim/testdir/test_shift.vim
+++ b/test/old/testdir/test_shift.vim
diff --git a/src/nvim/testdir/test_signals.vim b/test/old/testdir/test_signals.vim
index c291c68e0d..c291c68e0d 100644
--- a/src/nvim/testdir/test_signals.vim
+++ b/test/old/testdir/test_signals.vim
diff --git a/src/nvim/testdir/test_signs.vim b/test/old/testdir/test_signs.vim
index 129f1c1a0c..129f1c1a0c 100644
--- a/src/nvim/testdir/test_signs.vim
+++ b/test/old/testdir/test_signs.vim
diff --git a/src/nvim/testdir/test_sleep.vim b/test/old/testdir/test_sleep.vim
index a428f380b0..a428f380b0 100644
--- a/src/nvim/testdir/test_sleep.vim
+++ b/test/old/testdir/test_sleep.vim
diff --git a/src/nvim/testdir/test_smartindent.vim b/test/old/testdir/test_smartindent.vim
index e2d028e828..e2d028e828 100644
--- a/src/nvim/testdir/test_smartindent.vim
+++ b/test/old/testdir/test_smartindent.vim
diff --git a/src/nvim/testdir/test_sort.vim b/test/old/testdir/test_sort.vim
index 534393b724..534393b724 100644
--- a/src/nvim/testdir/test_sort.vim
+++ b/test/old/testdir/test_sort.vim
diff --git a/src/nvim/testdir/test_source.vim b/test/old/testdir/test_source.vim
index d4d96e36bf..d4d96e36bf 100644
--- a/src/nvim/testdir/test_source.vim
+++ b/test/old/testdir/test_source.vim
diff --git a/src/nvim/testdir/test_source_utf8.vim b/test/old/testdir/test_source_utf8.vim
index 66fabe0442..66fabe0442 100644
--- a/src/nvim/testdir/test_source_utf8.vim
+++ b/test/old/testdir/test_source_utf8.vim
diff --git a/src/nvim/testdir/test_spell.vim b/test/old/testdir/test_spell.vim
index c840e834b9..c840e834b9 100644
--- a/src/nvim/testdir/test_spell.vim
+++ b/test/old/testdir/test_spell.vim
diff --git a/src/nvim/testdir/test_spell_utf8.vim b/test/old/testdir/test_spell_utf8.vim
index 7c588d736a..7c588d736a 100644
--- a/src/nvim/testdir/test_spell_utf8.vim
+++ b/test/old/testdir/test_spell_utf8.vim
diff --git a/src/nvim/testdir/test_spellfile.vim b/test/old/testdir/test_spellfile.vim
index dbffbafed9..dbffbafed9 100644
--- a/src/nvim/testdir/test_spellfile.vim
+++ b/test/old/testdir/test_spellfile.vim
diff --git a/src/nvim/testdir/test_startup.vim b/test/old/testdir/test_startup.vim
index da467ea23f..da467ea23f 100644
--- a/src/nvim/testdir/test_startup.vim
+++ b/test/old/testdir/test_startup.vim
diff --git a/src/nvim/testdir/test_startup_utf8.vim b/test/old/testdir/test_startup_utf8.vim
index 2ee6ecc41d..2ee6ecc41d 100644
--- a/src/nvim/testdir/test_startup_utf8.vim
+++ b/test/old/testdir/test_startup_utf8.vim
diff --git a/src/nvim/testdir/test_stat.vim b/test/old/testdir/test_stat.vim
index d3059664e9..d3059664e9 100644
--- a/src/nvim/testdir/test_stat.vim
+++ b/test/old/testdir/test_stat.vim
diff --git a/src/nvim/testdir/test_statusline.vim b/test/old/testdir/test_statusline.vim
index 1e06ad1c67..1e06ad1c67 100644
--- a/src/nvim/testdir/test_statusline.vim
+++ b/test/old/testdir/test_statusline.vim
diff --git a/src/nvim/testdir/test_substitute.vim b/test/old/testdir/test_substitute.vim
index b2abbae168..b2abbae168 100644
--- a/src/nvim/testdir/test_substitute.vim
+++ b/test/old/testdir/test_substitute.vim
diff --git a/src/nvim/testdir/test_suspend.vim b/test/old/testdir/test_suspend.vim
index bf88bd4453..bf88bd4453 100644
--- a/src/nvim/testdir/test_suspend.vim
+++ b/test/old/testdir/test_suspend.vim
diff --git a/src/nvim/testdir/test_swap.vim b/test/old/testdir/test_swap.vim
index 4241f4fd69..4241f4fd69 100644
--- a/src/nvim/testdir/test_swap.vim
+++ b/test/old/testdir/test_swap.vim
diff --git a/src/nvim/testdir/test_syn_attr.vim b/test/old/testdir/test_syn_attr.vim
index 88f9d0d84d..88f9d0d84d 100644
--- a/src/nvim/testdir/test_syn_attr.vim
+++ b/test/old/testdir/test_syn_attr.vim
diff --git a/src/nvim/testdir/test_syntax.vim b/test/old/testdir/test_syntax.vim
index 45230c4208..45230c4208 100644
--- a/src/nvim/testdir/test_syntax.vim
+++ b/test/old/testdir/test_syntax.vim
diff --git a/src/nvim/testdir/test_system.vim b/test/old/testdir/test_system.vim
index 6c8373b335..6c8373b335 100644
--- a/src/nvim/testdir/test_system.vim
+++ b/test/old/testdir/test_system.vim
diff --git a/src/nvim/testdir/test_tab.vim b/test/old/testdir/test_tab.vim
index b8e8dfe062..b8e8dfe062 100644
--- a/src/nvim/testdir/test_tab.vim
+++ b/test/old/testdir/test_tab.vim
diff --git a/src/nvim/testdir/test_tabline.vim b/test/old/testdir/test_tabline.vim
index d9bef09067..d9bef09067 100644
--- a/src/nvim/testdir/test_tabline.vim
+++ b/test/old/testdir/test_tabline.vim
diff --git a/src/nvim/testdir/test_tabpage.vim b/test/old/testdir/test_tabpage.vim
index db23a36dd4..db23a36dd4 100644
--- a/src/nvim/testdir/test_tabpage.vim
+++ b/test/old/testdir/test_tabpage.vim
diff --git a/src/nvim/testdir/test_tagcase.vim b/test/old/testdir/test_tagcase.vim
index 53c08ccf1e..53c08ccf1e 100644
--- a/src/nvim/testdir/test_tagcase.vim
+++ b/test/old/testdir/test_tagcase.vim
diff --git a/src/nvim/testdir/test_tagfunc.vim b/test/old/testdir/test_tagfunc.vim
index cba96d3504..cba96d3504 100644
--- a/src/nvim/testdir/test_tagfunc.vim
+++ b/test/old/testdir/test_tagfunc.vim
diff --git a/src/nvim/testdir/test_tagjump.vim b/test/old/testdir/test_tagjump.vim
index be60a3535c..be60a3535c 100644
--- a/src/nvim/testdir/test_tagjump.vim
+++ b/test/old/testdir/test_tagjump.vim
diff --git a/src/nvim/testdir/test_taglist.vim b/test/old/testdir/test_taglist.vim
index 75d28c3ec4..75d28c3ec4 100644
--- a/src/nvim/testdir/test_taglist.vim
+++ b/test/old/testdir/test_taglist.vim
diff --git a/src/nvim/testdir/test_termcodes.vim b/test/old/testdir/test_termcodes.vim
index 99bc2d1d37..99bc2d1d37 100644
--- a/src/nvim/testdir/test_termcodes.vim
+++ b/test/old/testdir/test_termcodes.vim
diff --git a/src/nvim/testdir/test_textformat.vim b/test/old/testdir/test_textformat.vim
index 7a13de12f4..7a13de12f4 100644
--- a/src/nvim/testdir/test_textformat.vim
+++ b/test/old/testdir/test_textformat.vim
diff --git a/src/nvim/testdir/test_textobjects.vim b/test/old/testdir/test_textobjects.vim
index f21d6fcb99..f21d6fcb99 100644
--- a/src/nvim/testdir/test_textobjects.vim
+++ b/test/old/testdir/test_textobjects.vim
diff --git a/src/nvim/testdir/test_timers.vim b/test/old/testdir/test_timers.vim
index f94ee6c9f3..f94ee6c9f3 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/test/old/testdir/test_timers.vim
diff --git a/src/nvim/testdir/test_true_false.vim b/test/old/testdir/test_true_false.vim
index f3c7fff4a6..f3c7fff4a6 100644
--- a/src/nvim/testdir/test_true_false.vim
+++ b/test/old/testdir/test_true_false.vim
diff --git a/src/nvim/testdir/test_trycatch.vim b/test/old/testdir/test_trycatch.vim
index ef20e03126..ef20e03126 100644
--- a/src/nvim/testdir/test_trycatch.vim
+++ b/test/old/testdir/test_trycatch.vim
diff --git a/src/nvim/testdir/test_undo.vim b/test/old/testdir/test_undo.vim
index ee8b52caaf..ee8b52caaf 100644
--- a/src/nvim/testdir/test_undo.vim
+++ b/test/old/testdir/test_undo.vim
diff --git a/src/nvim/testdir/test_unlet.vim b/test/old/testdir/test_unlet.vim
index 4779d17906..4779d17906 100644
--- a/src/nvim/testdir/test_unlet.vim
+++ b/test/old/testdir/test_unlet.vim
diff --git a/src/nvim/testdir/test_user_func.vim b/test/old/testdir/test_user_func.vim
index 4742293ed5..4742293ed5 100644
--- a/src/nvim/testdir/test_user_func.vim
+++ b/test/old/testdir/test_user_func.vim
diff --git a/src/nvim/testdir/test_usercommands.vim b/test/old/testdir/test_usercommands.vim
index 898f7a59f1..898f7a59f1 100644
--- a/src/nvim/testdir/test_usercommands.vim
+++ b/test/old/testdir/test_usercommands.vim
diff --git a/src/nvim/testdir/test_utf8.vim b/test/old/testdir/test_utf8.vim
index e5f6d68720..e5f6d68720 100644
--- a/src/nvim/testdir/test_utf8.vim
+++ b/test/old/testdir/test_utf8.vim
diff --git a/src/nvim/testdir/test_utf8_comparisons.vim b/test/old/testdir/test_utf8_comparisons.vim
index f3c86b44fb..f3c86b44fb 100644
--- a/src/nvim/testdir/test_utf8_comparisons.vim
+++ b/test/old/testdir/test_utf8_comparisons.vim
diff --git a/src/nvim/testdir/test_vartabs.vim b/test/old/testdir/test_vartabs.vim
index e12c71d521..e12c71d521 100644
--- a/src/nvim/testdir/test_vartabs.vim
+++ b/test/old/testdir/test_vartabs.vim
diff --git a/src/nvim/testdir/test_version.vim b/test/old/testdir/test_version.vim
index 5fd38f7cdc..5fd38f7cdc 100644
--- a/src/nvim/testdir/test_version.vim
+++ b/test/old/testdir/test_version.vim
diff --git a/src/nvim/testdir/test_viminfo.vim b/test/old/testdir/test_viminfo.vim
index e792db90ab..e792db90ab 100644
--- a/src/nvim/testdir/test_viminfo.vim
+++ b/test/old/testdir/test_viminfo.vim
diff --git a/src/nvim/testdir/test_vimscript.vim b/test/old/testdir/test_vimscript.vim
index b0c4baf7c2..b0c4baf7c2 100644
--- a/src/nvim/testdir/test_vimscript.vim
+++ b/test/old/testdir/test_vimscript.vim
diff --git a/src/nvim/testdir/test_virtualedit.vim b/test/old/testdir/test_virtualedit.vim
index a2baf276ac..a2baf276ac 100644
--- a/src/nvim/testdir/test_virtualedit.vim
+++ b/test/old/testdir/test_virtualedit.vim
diff --git a/src/nvim/testdir/test_visual.vim b/test/old/testdir/test_visual.vim
index 350c69fe4e..350c69fe4e 100644
--- a/src/nvim/testdir/test_visual.vim
+++ b/test/old/testdir/test_visual.vim
diff --git a/src/nvim/testdir/test_winbuf_close.vim b/test/old/testdir/test_winbuf_close.vim
index 26b4ba8778..26b4ba8778 100644
--- a/src/nvim/testdir/test_winbuf_close.vim
+++ b/test/old/testdir/test_winbuf_close.vim
diff --git a/src/nvim/testdir/test_window_cmd.vim b/test/old/testdir/test_window_cmd.vim
index 34614832a9..34614832a9 100644
--- a/src/nvim/testdir/test_window_cmd.vim
+++ b/test/old/testdir/test_window_cmd.vim
diff --git a/src/nvim/testdir/test_window_id.vim b/test/old/testdir/test_window_id.vim
index 396a49b55f..396a49b55f 100644
--- a/src/nvim/testdir/test_window_id.vim
+++ b/test/old/testdir/test_window_id.vim
diff --git a/src/nvim/testdir/test_windows_home.vim b/test/old/testdir/test_windows_home.vim
index 3c2db01444..3c2db01444 100644
--- a/src/nvim/testdir/test_windows_home.vim
+++ b/test/old/testdir/test_windows_home.vim
diff --git a/src/nvim/testdir/test_wnext.vim b/test/old/testdir/test_wnext.vim
index 3df61ceb78..3df61ceb78 100644
--- a/src/nvim/testdir/test_wnext.vim
+++ b/test/old/testdir/test_wnext.vim
diff --git a/src/nvim/testdir/test_wordcount.vim b/test/old/testdir/test_wordcount.vim
index 6a3d4109a8..6a3d4109a8 100644
--- a/src/nvim/testdir/test_wordcount.vim
+++ b/test/old/testdir/test_wordcount.vim
diff --git a/src/nvim/testdir/test_writefile.vim b/test/old/testdir/test_writefile.vim
index 6019cee193..6019cee193 100644
--- a/src/nvim/testdir/test_writefile.vim
+++ b/test/old/testdir/test_writefile.vim
diff --git a/src/nvim/testdir/unix.vim b/test/old/testdir/unix.vim
index ce2beff7fe..ce2beff7fe 100644
--- a/src/nvim/testdir/unix.vim
+++ b/test/old/testdir/unix.vim
diff --git a/src/nvim/testdir/view_util.vim b/test/old/testdir/view_util.vim
index a4d0e56af9..a4d0e56af9 100644
--- a/src/nvim/testdir/view_util.vim
+++ b/test/old/testdir/view_util.vim
diff --git a/src/nvim/testdir/vim9.vim b/test/old/testdir/vim9.vim
index 2cc3d88aa8..2cc3d88aa8 100644
--- a/src/nvim/testdir/vim9.vim
+++ b/test/old/testdir/vim9.vim