patch 9.1.1525: tests: testdir/ is a bit messy

Problem:  tests: testdir is a bit messy
Solution: move test scripts into testdir/util/ directory

src/testdir/ has become a dumping ground mixing test cases with utility
functions. Let's fix this by moving all utility functions into the
testdir/util/ directory

Also a few related changes had to be done:
- Update Filelist
- update README.txt and mention the new directory layout
- fix shadowbuild by linking the util directory into the shadow dir

closes: #17677

Signed-off-by: Christian Brabandt <cb@256bit.org>

Filelist

@@ -184,64 +184,64 @@ SRC_ALL =	\
 		src/winclip.c \
 		src/window.c \
 		src/xxd/xxd.c \
-		src/testdir/gen_opt_test.vim \
-		src/testdir/README.txt \
-		src/testdir/Make_all.mak \
 		src/testdir/*.in \
 		src/testdir/*.py \
-		src/testdir/keycode_check.vim \
+		src/testdir/Make_all.mak \
-		src/testdir/keycode_check.json \
+		src/testdir/README.txt \
-		src/testdir/lsan-suppress.txt \
-		src/testdir/sautest/autoload/*.vim \
-		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
-		src/testdir/check.vim \
 		src/testdir/commondumps.vim \
-		src/testdir/gui_init.vim \
+		src/testdir/crash/* \
-		src/testdir/gui_preinit.vim \
+		src/testdir/dumps/*.dump \
-		src/testdir/mouse.vim \
+		src/testdir/dumps/*.vim \
-		src/testdir/runtest.vim \
+		src/testdir/keycode_check.json \
-		src/testdir/screendump.vim \
+		src/testdir/keycode_check.vim \
-		src/testdir/setup.vim \
+		src/testdir/lsan-suppress.txt \
-		src/testdir/setup_gui.vim \
-		src/testdir/shared.vim \
-		src/testdir/vim9.vim \
-		src/testdir/script_util.vim \
-		src/testdir/summarize.vim \
-		src/testdir/term_util.vim \
-		src/testdir/view_util.vim \
-		src/testdir/viewdumps.vim \
-		src/testdir/test[0-9]*.ok \
-		src/testdir/test77a.ok \
-		src/testdir/test77a.com \
-		src/testdir/test_*.vim \
 		src/testdir/python2/*.py \
 		src/testdir/python3/*.py \
+		src/testdir/python_after/*.py \
+		src/testdir/python_before/*.py \
 		src/testdir/pythonx/*.py \
 		src/testdir/pythonx/topmodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/__init__.py \
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
-		src/testdir/python_after/*.py \
-		src/testdir/python_before/*.py \
 		src/testdir/pyxfile/*.py \
-		src/testdir/dumps/*.dump \
+		src/testdir/ru_RU/LC_MESSAGES/Makefile \
-		src/testdir/dumps/*.vim \
+		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo \
+		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.po \
+		src/testdir/runtest.vim \
 		src/testdir/samples/*.html \
 		src/testdir/samples/*.txt \
 		src/testdir/samples/*.vim \
 		src/testdir/samples/poc.zip \
-		src/testdir/samples/test000 \
 		src/testdir/samples/test.zip \
+		src/testdir/samples/test000 \
 		src/testdir/samples/test_undo.txt.undo \
 		src/testdir/samples/testa.zip \
-		src/testdir/color_ramp.vim \
+		src/testdir/sautest/autoload/*.vim \
 		src/testdir/silent.wav \
-		src/testdir/popupbounce.vim \
+		src/testdir/test77a.com \
-		src/testdir/crash/* \
+		src/testdir/test77a.ok \
-		src/testdir/ru_RU/LC_MESSAGES/Makefile \
+		src/testdir/test[0-9]*.ok \
-		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.po \
+		src/testdir/test_*.vim \
-		src/testdir/ru_RU/LC_MESSAGES/__PACKAGE__.mo \
+		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
-		src/testdir/window_manager.vim \
+		src/testdir/util/check.vim \
+		src/testdir/util/color_ramp.vim \
+		src/testdir/util/gen_opt_test.vim \
+		src/testdir/util/gui_init.vim \
+		src/testdir/util/gui_preinit.vim \
+		src/testdir/util/mouse.vim \
+		src/testdir/util/popupbounce.vim \
+		src/testdir/util/screendump.vim \
+		src/testdir/util/script_util.vim \
+		src/testdir/util/setup.vim \
+		src/testdir/util/setup_gui.vim \
+		src/testdir/util/shared.vim \
+		src/testdir/util/summarize.vim \
+		src/testdir/util/term_util.vim \
+		src/testdir/util/view_util.vim \
+		src/testdir/util/vim9.vim \
+		src/testdir/util/window_manager.vim \
+		src/testdir/viewdumps.vim \
 		src/proto.h \
 		src/protodef.h \
 		src/proto/alloc.pro \
@@ -521,7 +521,7 @@ SRC_UNIX =	\
 		src/proto/pty.pro \
 		src/pty.c \
 		src/testdir/Makefile \
-		src/testdir/unix.vim \
+		src/testdir/util/unix.vim \
 		src/toolcheck \
 		src/vim_icon.xbm \
 		src/vim_mask.xbm \
@@ -615,7 +615,7 @@ SRC_DOS =	\
 		src/testdir/Make_dos.mak \
 		src/testdir/Make_mvc.mak \
 		src/testdir/Make_ming.mak \
-		src/testdir/dos.vim \
+		src/testdir/util/dos.vim \
 		src/uninstall.c \
 		src/vim.rc \
 		src/vim.manifest \
@@ -668,7 +668,7 @@ SRC_AMI =	\
 		src/os_amiga.h \
 		src/proto/os_amiga.pro \
 		src/testdir/Make_amiga.mak \
-		src/testdir/amiga.vim \
+		src/testdir/util/amiga.vim \
 		src/xxd/Make_amiga.mak \
 
 # Source files for Haiku (also in the extra archive).
@@ -699,7 +699,7 @@ SRC_VMS =	\
 		src/os_vms_mms.c \
 		src/proto/os_vms.pro \
 		src/testdir/Make_vms.mms \
-		src/testdir/vms.vim \
+		src/testdir/util/vms.vim \
 		src/xxd/Make_vms.mms \
 		vimtutor.com \
 

runtime/syntax/testdir/runtest.vim

@@ -69,7 +69,8 @@ endif
 " Use the script for source code screendump testing.  It sources other scripts,
 " therefore we must "cd" there.
 cd ../../src/testdir
-source screendump.vim
+source util/screendump.vim
+source util/term_util.vim
 exe 'cd ' .. fnameescape(syntaxDir)
 
 " For these tests we need to be able to run terminal Vim with 256 colors.  On

src/Makefile

@@ -3022,6 +3022,7 @@ shadow:	runtime pixmaps
 				 ../../testdir/ru_RU \
 				 ../../testdir/sautest \
 				 ../../testdir/samples \
+				 ../../testdir/util \
 				 ../../testdir/dumps \
 				 ../../testdir/*.ok \
 				 ../../testdir/testluaplugin \

src/testdir/Make_amiga.mak

@@ -21,7 +21,7 @@ clean:
 
 .in.out:
 	copy $*.ok test.ok
-	$(VIMPROG) -u amiga.vim -U NONE --noplugin --not-a-term -s dotest.in $*.in
+	$(VIMPROG) -u util/amiga.vim -U NONE --noplugin --not-a-term -s dotest.in $*.in
 	diff test.out $*.ok
 	rename test.out $*.out
 	-delete X#? ALL QUIET

src/testdir/Make_ming.mak

@@ -46,7 +46,7 @@ report:
 	@rem without the +eval feature test_result.log is a copy of test.log
 	@if exist test.log ( copy /y test.log test_result.log > nul ) \
 		else ( echo No failures reported > test_result.log )
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S summarize.vim messages
+	$(VIMPROG) -u NONE $(COMMON_ARGS) -S util\summarize.vim messages
 	-if exist starttime del starttime
 	@echo.
 	@echo Test results:
@@ -105,7 +105,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 $(DOSTMP)/%.in : %.in
 	if not exist $(DOSTMP)\nul mkdir $(DOSTMP)
 	if exist $(DOSTMP)\$< $(DEL) $(DOSTMP)\$<
-	$(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $<
+	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $<
 
 # For each input file dostmp/test99.in run the tests.
 # This moves test99.in to test99.in.bak temporarily.
@@ -115,7 +115,7 @@ $(DOSTMP)/%.in : %.in
 	$(MV) $(notdir $<) $(notdir $<).bak > NUL
 	$(CP) $(DOSTMP)\$(notdir $<) $(notdir $<) > NUL
 	$(CP) $(basename $@).ok test.ok > NUL
-	$(VIMPROG) -u dos.vim $(COMMON_ARGS) -s dotest.in $(notdir $<)
+	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) -s dotest.in $(notdir $<)
 	-@if exist test.out $(MV) test.out $(DOSTMP)\$@ > NUL
 	-@if exist $(notdir $<).bak $(MV) $(notdir $<).bak $(notdir $<) > NUL
 	-@if exist test.ok $(DEL) test.ok
@@ -124,7 +124,7 @@ $(DOSTMP)/%.in : %.in
 	-@if exist XfakeHOME $(DELDIR) XfakeHOME
 	-@del X*
 	-@if exist viminfo del viminfo
-	$(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
+	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
 		$(DOSTMP)\$@
 	@diff test.out $(basename $@).ok & if errorlevel 1 \
 		( $(MV) test.out $(basename $@).failed > NUL \
@@ -154,10 +154,10 @@ test_gui.res: test_gui.vim
 
 test_gui_init.res: test_gui_init.vim
 	@echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
+	$(VIMPROG) -u util\gui_preinit.vim -U util\gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
 	@$(DEL) vimcmd
 
-opt_test.vim: gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
+opt_test.vim: util/gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
 	$(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $^
 	@if test -f test.log; then \
 		cat test.log; \

src/testdir/Make_mvc.mak

@@ -40,7 +40,7 @@ report:
 	@rem without the +eval feature test_result.log is a copy of test.log
 	@if exist test.log ( copy /y test.log test_result.log > nul ) \
 		else ( echo No failures reported > test_result.log )
-	$(VIMPROG) -u NONE $(COMMON_ARGS) -S summarize.vim messages
+	$(VIMPROG) -u NONE $(COMMON_ARGS) -S util\summarize.vim messages
 	-if exist starttime del starttime
 	@echo:
 	@echo Test results:
@@ -99,7 +99,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 $(DOSTMP_INFILES): $(*B).in
 	if not exist $(DOSTMP)\NUL md $(DOSTMP)
 	if exist $@ del $@
-	$(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $(*B).in
+	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=dos|f $@|wq" $(*B).in
 
 # For each input file dostmp/test99.in run the tests.
 # This moves test99.in to test99.in.bak temporarily.
@@ -109,7 +109,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 	move $(*B).in $(*B).in.bak > nul
 	copy $(DOSTMP)\$(*B).in $(*B).in > nul
 	copy $(*B).ok test.ok > nul
-	$(VIMPROG) -u dos.vim $(COMMON_ARGS) -s dotest.in $(*B).in
+	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) -s dotest.in $(*B).in
 	-@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out > nul
 	-@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in > nul
 	-@if exist test.ok del test.ok
@@ -118,7 +118,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 	-@if exist XfakeHOME rd /s /q XfakeHOME
 	-@del X*
 	-@if exist viminfo del viminfo
-	$(VIMPROG) -u dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
+	$(VIMPROG) -u util\dos.vim $(COMMON_ARGS) "+set ff=unix|f test.out|wq" \
 		$(DOSTMP)\$(*B).out
 	@diff test.out $*.ok & if errorlevel 1 \
 		( move /y test.out $*.failed > nul \
@@ -148,10 +148,10 @@ test_gui.res: test_gui.vim
 
 test_gui_init.res: test_gui_init.vim
 	@echo $(VIMPROG) > vimcmd
-	$(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim
+	$(VIMPROG) -u util\gui_preinit.vim -U util\gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim
 	@del vimcmd
 
-opt_test.vim: gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
+opt_test.vim: util/gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
 	$(VIMPROG) -e -s -u NONE $(COMMON_ARGS) --nofork -S $**
 	@if exist test.log ( type test.log & exit /b 1 )
 

src/testdir/Make_vms.mms

@@ -56,7 +56,7 @@ GUI_OPTION = -g
 	-@ write sys$output "                "$*" "
 	-@ write sys$output "-----------------------------------------------"
 	-@ !run the test
-	-@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in
+	-@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u util/vms.vim --noplugin -s dotest.in $*.in
 	-@ !analyse the result
 	-@ directory /size/date test.out
 	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename/nolog test.out $*.out 
@@ -89,9 +89,9 @@ nolog :
 	-@ write sys$output "-----------------------------------------------"
 	-@ write sys$output "MAKE_VMS.MMS options:"
 	-@ write sys$output "   WANT_GUI   = ""$(WANT_GUI)"" "
-	-@ write sys$output "Default vimrc file is VMS.VIM:"
+	-@ write sys$output "Default vimrc file is util/VMS.VIM:"
 	-@ write sys$output "-----------------------------------------------"
-	-@ type VMS.VIM
+	-@ type util/VMS.VIM
 
 clean :
 	-@ if "''F$SEARCH("*.out")'"        .NES. "" then delete/noconfirm/nolog *.out.*

src/testdir/Makefile

@@ -21,7 +21,7 @@ REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C a
 # VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$*
 
 # To execute one test, e.g. in gdb, use something like this:
-# run -f -u unix.vim --gui-dialog-file guidialog -U NONE --noplugin --not-a-term -S runtest.vim test_name.vim
+# run -f -u util/unix.vim --gui-dialog-file guidialog -U NONE --noplugin --not-a-term -S runtest.vim test_name.vim
 
 default: nongui
 
@@ -48,7 +48,7 @@ report:
 		then cp test.log test_result.log; \
 		else echo No failures reported > test_result.log; \
 		fi"
-	$(VIMPROG) -u NONE $(NO_INITS) -S summarize.vim messages $(REDIR_TEST_TO_NULL)
+	$(VIMPROG) -u NONE $(NO_INITS) -S util/summarize.vim messages $(REDIR_TEST_TO_NULL)
 	@rm -f starttime
 	@echo
 	@echo 'Test results:'
@@ -87,7 +87,7 @@ test_vim9:
 
 RM_ON_RUN = test.out X* viminfo
 RM_ON_START = test.ok benchmark.out
-RUN_VIMPROG = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
+RUN_VIMPROG = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u util/unix.vim $(NO_INITS) -s dotest.in
 
 # Delete files that may interfere with running tests.  This includes some files
 # that may result from working on the tests, not only from running them.
@@ -141,7 +141,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 # to write and a lot easier to read and debug.
 # Limitation: Only works with the +eval feature.
 # Add --gui-dialog-file to avoid getting stuck in a dialog.
-RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim --gui-dialog-file guidialog
+RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u util/unix.vim --gui-dialog-file guidialog
 
 newtests: newtestssilent
 	@/bin/sh -c "if test -f messages; then cat messages; fi"
@@ -174,13 +174,13 @@ test_gui_init.res: test_gui_init.vim
 	@echo "$(VIMPROG)" > vimcmd
 	@echo "$(RUN_GVIMTEST_WITH_GVIMRC)" >> vimcmd
 	if test -n "$${ASAN_OPTIONS}"; then \
-		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< ; \
+		ASAN_OPTIONS="$${ASAN_OPTIONS}_$*" UBSAN_OPTIONS="$${UBSAN_OPTIONS}_$*" $(RUN_VIMTEST) -u util/gui_preinit.vim -U util/gui_init.vim $(NO_PLUGINS) -S runtest.vim $< ; \
 	else \
-		$(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< ; \
+		$(RUN_VIMTEST) -u util/gui_preinit.vim -U util/gui_init.vim $(NO_PLUGINS) -S runtest.vim $< ; \
 	fi
 	@rm vimcmd
 
-GEN_OPT_DEPS = gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
+GEN_OPT_DEPS = util/gen_opt_test.vim ../optiondefs.h ../../runtime/doc/options.txt
 
 opt_test.vim: $(GEN_OPT_DEPS)
 	if test -n "$${ASAN_OPTIONS}"; then \

src/testdir/README.txt

@@ -1,5 +1,8 @@
-This directory contains tests for various Vim features.
+This directory contains test cases for various Vim features.
+The auxiliary functions to perform the tests are in the util/ folder.
+
 For testing an indent script see runtime/indent/testdir/README.txt.
+For testing a syntax script see runtime/syntax/testdir/README.txt.
 
 If it makes sense, add a new test method to an already existing file.  You may
 want to separate it from other tests with comment lines.

src/testdir/runtest.vim

@@ -101,13 +101,13 @@ endif
 set shellslash
 
 " Common with all tests on all systems.
-source setup.vim
+source util/setup.vim
 
 " Needed for RunningWithValgrind().
-source shared.vim
+source util/shared.vim
 
 " Needed for the various Check commands
-source check.vim
+source util/check.vim
 
 " For consistency run all tests with 'nocompatible' set.
 " This also enables use of line continuation.

src/testdir/test_autocmd.vim

@@ -1,7 +1,7 @@
 " Tests for autocommands
 
-source screendump.vim
+source util/screendump.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func s:cleanup_buffers() abort
   for bnr in range(1, bufnr('$'))

src/testdir/test_balloon.vim

@@ -4,7 +4,7 @@
 CheckNotGui
 CheckFeature balloon_eval_term
 
-source screendump.vim
+source util/screendump.vim
 
 let s:common_script =<< trim [CODE]
   call setline(1, ["one one one", "two tXo two", "three three three"])

src/testdir/test_blob.vim

@@ -1,6 +1,6 @@
 " Tests for the Blob types
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func TearDown()
   " Run garbage collection after every test

src/testdir/test_breakindent.vim

@@ -6,7 +6,7 @@
 " Test_breakindent08())
 CheckOption breakindent
 
-source screendump.vim
+source util/screendump.vim
 
 func SetUp()
   let s:input ="\tabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP"

src/testdir/test_bufline.vim

@@ -1,6 +1,6 @@
 " Tests for setbufline(), getbufline(), appendbufline(), deletebufline()
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_setbufline_getbufline()
   " similar to Test_set_get_bufline()

src/testdir/test_channel.vim

@@ -3,7 +3,7 @@
 " When +channel is supported then +job is too, so we don't check for that.
 CheckFeature channel
 
-source screendump.vim
+source util/screendump.vim
 
 let s:python = PythonProg()
 if s:python == ''

src/testdir/test_clientserver.vim

@@ -8,7 +8,7 @@ endif
 
 CheckFeature clientserver
 
-source shared.vim
+source util/shared.vim
 
 func Check_X11_Connection()
   if has('x11')

src/testdir/test_clipmethod.vim

@@ -1,6 +1,6 @@
 " Tests for clipmethod
 
-source window_manager.vim
+source util/window_manager.vim
 
 CheckFeature clipboard_working
 CheckFeature xterm_clipboard
@@ -123,7 +123,7 @@ func Test_clipreset_switches()
 
   let l:lines =<< trim END
     set cpm=x11
-    source shared.vim
+    source util/shared.vim
 
     func Test()
       clipreset

src/testdir/test_cmdline.vim

@@ -1,7 +1,7 @@
 " Tests for editing the command line.
 
-source screendump.vim
+source util/screendump.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func SetUp()
   func SaveLastScreenLine()

src/testdir/test_cmdwin.vim

@@ -1,6 +1,6 @@
 " Tests for editing the command line.
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_getcmdwintype()
   call feedkeys("q/:let a = getcmdwintype()\<CR>:q\<CR>", 'x!')

src/testdir/test_conceal.vim

@@ -2,7 +2,7 @@
 
 CheckFeature conceal
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_conceal_two_windows()
   CheckScreendump

src/testdir/test_crash.vim

@@ -1,5 +1,5 @@
 " Some tests, that used to crash Vim
-source screendump.vim
+source util/screendump.vim
 
 CheckScreendump
 

src/testdir/test_cursorline.vim

@@ -1,6 +1,6 @@
 " Test for cursorline and cursorlineopt
 
-source screendump.vim
+source util/screendump.vim
 
 func s:screen_attr(lnum) abort
   return map(range(1, 8), 'screenattr(a:lnum, v:val)')

src/testdir/test_debugger.vim

@@ -1,6 +1,6 @@
 " Tests for the Vim script debug commands
 
-source screendump.vim
+source util/screendump.vim
 
 CheckRunVimInTerminal
 

src/testdir/test_delete.vim

@@ -1,6 +1,6 @@
 " Test for delete().
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_file_delete()
   split Xfdelfile

src/testdir/test_diffmode.vim

@@ -1,6 +1,6 @@
 " Tests for diff mode
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_diff_fold_sync()
   enew!

src/testdir/test_display.vim

@@ -4,7 +4,7 @@ if !has('gui_running') && has('unix')
   set term=ansi
 endif
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_display_foldcolumn()
   CheckFeature folding

src/testdir/test_edit.vim

@@ -4,7 +4,7 @@ if exists("+t_kD")
   let &t_kD="[3;*~"
 endif
 
-source screendump.vim
+source util/screendump.vim
 
 " Needs to come first until the bug in getchar() is
 " fixed: https://groups.google.com/d/msg/vim_dev/fXL9yme4H4c/bOR-U6_bAQAJ

src/testdir/test_eval_stuff.vim

@@ -1,7 +1,7 @@
 " Tests for various eval things.
 
-source shared.vim
+source util/shared.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 function s:foo() abort
   try

src/testdir/test_excmd.vim

@@ -1,6 +1,6 @@
 " Tests for various Ex commands.
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_ex_delete()
   new

src/testdir/test_execute_func.vim

@@ -1,6 +1,6 @@
 " test execute()
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func NestedEval()
   let nested = execute('echo "nested\nlines"')

src/testdir/test_exists.vim

@@ -1,6 +1,6 @@
 " Tests for the exists() function
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_exists()
   augroup myagroup

src/testdir/test_expr.vim

@@ -1,6 +1,6 @@
 " Tests for expressions.
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_equal()
   let base = {}

src/testdir/test_filter_map.vim

@@ -1,6 +1,6 @@
 " Test filter() and map()
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 " list with expression string
 func Test_filter_map_list_expr_string()

src/testdir/test_findfile.vim

@@ -1,6 +1,6 @@
 " Test findfile() and finddir()
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 let s:files = [ 'Xfinddir1/foo',
       \         'Xfinddir1/bar',

src/testdir/test_float_func.vim

@@ -1,6 +1,6 @@
 " test float functions
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_abs()
   call assert_equal('1.23', string(abs(1.23)))

src/testdir/test_fold.vim

@@ -1,6 +1,6 @@
 " Test for folding
 
-source screendump.vim
+source util/screendump.vim
 
 func PrepIndent(arg)
   return [a:arg] + repeat(["\t".a:arg], 5)

src/testdir/test_format.vim

@@ -1,6 +1,6 @@
 " Tests for expressions.
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_printf_pos_misc()
   let lines =<< trim END

src/testdir/test_functions.vim

@@ -1,7 +1,7 @@
 " Tests for various functions.
 
-source screendump.vim
+source util/screendump.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 " Must be done first, since the alternate buffer must be unset.
 func Test_00_bufexists()

src/testdir/test_glob2regpat.vim

@@ -1,6 +1,6 @@
 " Test glob2regpat()
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_glob2regpat_invalid()
   call assert_equal('^1\.33$', glob2regpat(1.33))

src/testdir/test_gui.vim

@@ -2,7 +2,7 @@
 
 CheckCanRunGui
 
-source setup_gui.vim
+source util/setup_gui.vim
 
 func Setup()
   call GUISetUpCommon()

src/testdir/test_gui_init.vim

@@ -3,7 +3,7 @@
 
 CheckCanRunGui
 
-source setup_gui.vim
+source util/setup_gui.vim
 
 func Setup()
   call GUISetUpCommon()

src/testdir/test_help.vim

@@ -1,6 +1,6 @@
 " Tests for :help
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_help_restore_snapshot()
   help

src/testdir/test_highlight.vim

@@ -1,8 +1,8 @@
 " Tests for ":highlight" and highlighting.
 
-source screendump.vim
+source util/screendump.vim
-source script_util.vim
+source util/script_util.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func ClearDict(d)
   for k in keys(a:d)

src/testdir/test_hlsearch.vim

@@ -1,6 +1,6 @@
 " Test for v:hlsearch
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_hlsearch()
   new

src/testdir/test_iminsert.vim

@@ -1,6 +1,6 @@
 " Test for 'iminsert'
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 let s:imactivatefunc_called = 0
 let s:imstatusfunc_called = 0

src/testdir/test_ins_complete.vim

@@ -1,7 +1,7 @@
 " Test for insert completion
 
-source screendump.vim
+source util/screendump.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 " Test for insert expansion
 func Test_ins_complete()

src/testdir/test_lambda.vim

@@ -1,6 +1,6 @@
 " Test for lambda and closure
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_lambda_feature()
   call assert_equal(1, has('lambda'))

src/testdir/test_let.vim

@@ -1,6 +1,6 @@
 " Tests for the :let command.
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_let()
   " Test to not autoload when assigning.  It causes internal error.

src/testdir/test_listchars.vim

@@ -1,6 +1,6 @@
 " Tests for 'listchars' display with 'list' and :list
 
-source screendump.vim
+source util/screendump.vim
 
 func Check_listchars(expected, end_lnum, end_scol = -1, leftcol = 0)
   if a:leftcol > 0

src/testdir/test_listdict.vim

@@ -1,7 +1,7 @@
 " Tests for the List and Dict types
 scriptencoding utf-8
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func TearDown()
   " Run garbage collection after every test

src/testdir/test_listlbr.vim

@@ -6,7 +6,7 @@ scriptencoding latin1
 CheckOption linebreak
 CheckFeature conceal
 
-source screendump.vim
+source util/screendump.vim
 
 function s:screen_lines(lnum, width) abort
   return ScreenLines(a:lnum, a:width)

src/testdir/test_listlbr_utf8.vim

@@ -7,7 +7,7 @@ CheckOption linebreak
 CheckFeature conceal
 CheckFeature signs
 
-source screendump.vim
+source util/screendump.vim
 
 func s:screen_lines(lnum, width) abort
   return ScreenLines(a:lnum, a:width)

src/testdir/test_mapping.vim

@@ -1,7 +1,7 @@
 " Tests for mappings and abbreviations
 
-source screendump.vim
+source util/screendump.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_abbreviation()
   new

src/testdir/test_match.vim

@@ -1,7 +1,7 @@
 " Test for :match, :2match, :3match, clearmatches(), getmatches(), matchadd(),
 " matchaddpos(), matcharg(), matchdelete(), and setmatches().
 
-source screendump.vim
+source util/screendump.vim
 
 function Test_match()
   highlight MyGroup1 term=bold ctermbg=red guibg=red

src/testdir/test_menu.vim

@@ -2,7 +2,7 @@
 
 CheckFeature menu
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_load_menu()
   try

src/testdir/test_messages.vim

@@ -1,6 +1,6 @@
 " Tests for :messages, :echomsg, :echoerr
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_messages()
   let oldmore = &more

src/testdir/test_modeless.vim

@@ -4,7 +4,7 @@
 CheckNotGui
 CheckUnix
 
-source mouse.vim
+source util/mouse.vim
 
 " Test for modeless characterwise selection (single click)
 func Test_modeless_characterwise_selection()

src/testdir/test_move.vim

@@ -1,6 +1,6 @@
 " Test the ":move" command.
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_move()
   enew!

src/testdir/test_mswin_event.vim

@@ -2,7 +2,7 @@
 " Most of this works the same in Windows GUI as well as Windows console.
 
 CheckMSWindows
-source mouse.vim
+source util/mouse.vim
 
 " Helper function for sending a grouped sequence of low level key presses
 " The modifier key(s) can be included as VK Key Codes in the sequence

src/testdir/test_netbeans.vim

@@ -876,7 +876,7 @@ func Nb_quit_with_conn(port)
   call delete("Xnetbeans")
   call writefile([], "Xnetbeans", 'D')
   let after =<< trim END
-    source shared.vim
+    source util/shared.vim
     set cpo&vim
 
     func ReadXnetbeans()

src/testdir/test_normal.vim

@@ -1,7 +1,7 @@
 " Test for various Normal mode commands
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
-source screendump.vim
+source util/screendump.vim
 
 func Setup_NewWindow()
   10new

src/testdir/test_number.vim

@@ -1,6 +1,6 @@
 " Test for 'number' and 'relativenumber'
 
-source screendump.vim
+source util/screendump.vim
 
 func s:screen_lines(start, end) abort
   return ScreenLines([a:start, a:end], 8)

src/testdir/test_options.vim

@@ -340,12 +340,12 @@ func Test_set_completion()
   " Expand directories.
   call feedkeys(":set cdpath=./\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_match(' ./samples/ ', @:)
-  call assert_notmatch(' ./summarize.vim ', @:)
+  call assert_notmatch(' ./util/summarize.vim ', @:)
   set cdpath&
 
   " Expand files and directories.
   call feedkeys(":set tags=./\<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_match(' ./samples/.* ./summarize.vim', @:)
+  call assert_match(' ./samples/.* ./test10.in', @:)
 
   call feedkeys(":set tags=./\\\\ dif\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"set tags=./\\ diff diffexpr diffopt', @:)

src/testdir/test_options_all.vim

@@ -1,7 +1,7 @@
 " Test for options
 
 " opt_test.vim is generated from src/optiondefs.h and runtime/doc/options.txt
-" using gen_opt_test.vim
+" using util/gen_opt_test.vim
 if filereadable('opt_test.vim')
   source opt_test.vim
 else

src/testdir/test_plugin_matchparen.vim

@@ -4,7 +4,7 @@ if !has('gui_running') && has('unix')
   set term=ansi
 endif
 
-source screendump.vim
+source util/screendump.vim
 
 " Test for scrolling that modifies buffer during visual block
 func Test_visual_block_scroll()

src/testdir/test_plugin_termdebug.vim

@@ -1,6 +1,6 @@
 " Test for the termdebug plugin
 
-source screendump.vim
+source util/screendump.vim
 
 CheckUnix
 CheckFeature terminal

src/testdir/test_plugin_tutor.vim

@@ -1,7 +1,7 @@
 " Test for the new-tutor plugin
 
-source screendump.vim
+source util/screendump.vim
-source script_util.vim
+source util/script_util.vim
 
 func SetUp()
   set nocompatible

src/testdir/test_popup.vim

@@ -1,6 +1,6 @@
 " Test for completion menu
 
-source screendump.vim
+source util/screendump.vim
 
 let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
 let g:setting = ''

src/testdir/test_popupwin.vim

@@ -2,7 +2,7 @@
 
 CheckFeature popupwin
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_simple_popup()
   CheckScreendump

src/testdir/test_popupwin_textprop.vim

@@ -3,7 +3,7 @@
 CheckFeature popupwin
 CheckFeature textprop
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_textprop_popup()
   CheckScreendump

src/testdir/test_profile.vim

@@ -2,7 +2,7 @@
 
 CheckFeature profile
 
-source screendump.vim
+source util/screendump.vim
 
 if has('prof_nsec')
   let s:header = 'count     total (s)      self (s)'

src/testdir/test_prompt_buffer.vim

@@ -2,7 +2,7 @@
 
 CheckFeature channel
 
-source screendump.vim
+source util/screendump.vim
 
 func CanTestPromptBuffer()
   " We need to use a terminal window to be able to feed keys without leaving

src/testdir/test_put.vim

@@ -1,6 +1,6 @@
 " Tests for put commands, e.g. ":put", "p", "gp", "P", "gP", etc.
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_put_block()
   new

src/testdir/test_quickfix.vim

@@ -1,9 +1,9 @@
 " Test for the quickfix feature.
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 CheckFeature quickfix
 
-source screendump.vim
+source util/screendump.vim
 
 set encoding=utf-8
 

src/testdir/test_remote.vim

@@ -3,8 +3,8 @@
 CheckFeature clientserver
 CheckFeature terminal
 
-source screendump.vim
+source util/screendump.vim
-source mouse.vim
+source util/mouse.vim
 
 let s:remote_works = 0
 let s:skip = 'Skipped: --remote feature is not possible'

src/testdir/test_scroll_opt.vim

@@ -1,7 +1,7 @@
 " Test for 'scroll', 'scrolloff', 'smoothscroll', etc.
 
-source screendump.vim
+source util/screendump.vim
-source mouse.vim
+source util/mouse.vim
 
 func Test_reset_scroll()
   let scr = &l:scroll

src/testdir/test_search.vim

@@ -1,6 +1,6 @@
 " Test for the search command
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_search_cmdline()
   CheckOption incsearch

src/testdir/test_search_stat.vim

@@ -1,6 +1,6 @@
 " Tests for search_stats, when "S" is not in 'shortmess'
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_search_stat()
   new

src/testdir/test_selectmode.vim

@@ -4,7 +4,7 @@
 CheckNotGui
 CheckUnix
 
-source mouse.vim
+source util/mouse.vim
 
 " Test for select mode
 func Test_selectmode_basic()

src/testdir/test_signs.vim

@@ -2,7 +2,7 @@
 
 CheckFeature signs
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_sign()
   new

src/testdir/test_spell.vim

@@ -3,7 +3,7 @@
 
 CheckFeature spell
 
-source screendump.vim
+source util/screendump.vim
 
 func TearDown()
   set nospell

src/testdir/test_stacktrace.vim

@@ -1,6 +1,6 @@
 " Test for getstacktrace() and v:stacktrace
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 let s:thisfile = expand('%:p')
 let s:testdir = s:thisfile->fnamemodify(':h')

src/testdir/test_startup.vim

@@ -1,6 +1,6 @@
 " Tests for startup.
 
-source screendump.vim
+source util/screendump.vim
 
 " Check that loading startup.vim works.
 func Test_startup_script()

src/testdir/test_startup_utf8.vim

@@ -1,6 +1,6 @@
 " Tests for startup using utf-8.
 
-source screendump.vim
+source util/screendump.vim
 
 func Test_read_stdin_utf8()
   let linesin = ['テスト', '€ÀÈÌÒÙ']

src/testdir/test_statusline.vim

@@ -3,7 +3,7 @@
 " Not tested yet:
 "   %N
 
-source screendump.vim
+source util/screendump.vim
 
 func SetUp()
   set laststatus=2

src/testdir/test_substitute.vim

@@ -1,6 +1,6 @@
 " Tests for the substitute (:s) command
 
-source screendump.vim
+source util/screendump.vim
 
 " NOTE: This needs to be the first test to be
 "       run in the file, since it depends on

src/testdir/test_syntax.vim

@@ -2,7 +2,7 @@
 
 CheckFeature syntax
 
-source screendump.vim
+source util/screendump.vim
 
 func GetSyntaxItem(pat)
   let c = ''

src/testdir/test_tabline.vim

@@ -1,6 +1,6 @@
 " Test for tabline
 
-source screendump.vim
+source util/screendump.vim
 
 func TablineWithCaughtError()
   let s:func_in_tabline_called = 1

src/testdir/test_tabpage.vim

@@ -1,6 +1,6 @@
 " Tests for tabpage
 
-source screendump.vim
+source util/screendump.vim
 
 function Test_tabpage()
   CheckFeature quickfix

src/testdir/test_tabpanel.vim

@@ -1,6 +1,6 @@
 " Tests for tabpanel
 
-source screendump.vim
+source util/screendump.vim
 CheckFeature tabpanel
 
 function s:reset()

src/testdir/test_tagfunc.vim

@@ -1,7 +1,7 @@
 " Test 'tagfunc'
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
-source screendump.vim
+source util/screendump.vim
 
 func TagFunc(pat, flag, info)
   let g:tagfunc_args = [a:pat, a:flag, a:info]

src/testdir/test_tagjump.vim

@@ -1,6 +1,6 @@
 " Tests for tagjump (tags and special searches)
 
-source screendump.vim
+source util/screendump.vim
 
 " SEGV occurs in older versions.  (At least 7.4.1748 or older)
 func Test_ptag_with_notagstack()

src/testdir/test_termcodes.vim

@@ -4,7 +4,7 @@
 CheckNotGui
 CheckUnix
 
-source mouse.vim
+source util/mouse.vim
 
 func s:TermGuiColorsTest()
   CheckNotMSWindows

src/testdir/test_termencoding.vim

@@ -4,7 +4,8 @@
 " This only works with "iconv".
 CheckFeature iconv
 
-source screendump.vim
+source util/screendump.vim
+
 if !CanRunVimInTerminal()
   throw 'Skipped: cannot make screendumps'
 endif

src/testdir/test_terminal.vim

@@ -4,8 +4,8 @@
 
 CheckFeature terminal
 
-source screendump.vim
+source util/screendump.vim
-source mouse.vim
+source util/mouse.vim
 
 let s:python = PythonProg()
 let $PROMPT_COMMAND=''

src/testdir/test_terminal2.vim

@@ -4,8 +4,8 @@
 
 CheckFeature terminal
 
-source screendump.vim
+source util/screendump.vim
-source mouse.vim
+source util/mouse.vim
 
 let $PROMPT_COMMAND=''
 

src/testdir/test_terminal3.vim

@@ -4,10 +4,10 @@
 
 CheckFeature terminal
 
-source screendump.vim
+source util/screendump.vim
-source mouse.vim
+source util/mouse.vim
 
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 let $PROMPT_COMMAND=''
 
@@ -806,7 +806,7 @@ endfunc
 " Test for sync buffer cwd with shell's pwd
 func Test_terminal_sync_shell_dir()
   CheckUnix
-  " The test always use sh (see src/testdir/unix.vim).
+  " The test always use sh (see src/testdir/util/unix.vim).
   " BSD's sh doesn't seem to play well with the OSC 7 escape sequence.
   CheckNotBSD
 

src/testdir/test_terminal_fail.vim

@@ -4,8 +4,6 @@
 
 CheckFeature terminal
 
-source shared.vim
-
 func Test_terminal_redir_fails()
   CheckUnix
 

src/testdir/test_textprop.vim

@@ -3,8 +3,8 @@
 
 CheckFeature textprop
 
-source screendump.vim
+source util/screendump.vim
-import './vim9.vim' as v9
+import './util/vim9.vim' as v9
 
 func Test_proptype_global()
   call prop_type_add('comment', {'highlight': 'Directory', 'priority': 123, 'start_incl': 1, 'end_incl': 1})