test: Remove references to tiny.vim/small.vim/mbyte.vim

Vim creates these scripts in test1 depending on what build features
are enabled so that tests that use these features are skiped if
necessary. Because Neovim only has one type of build (and the features
+eval, +windows, and +multi-byte are enabled in this build) they are
not necessary.

29 files changed, 5 insertions, 70 deletions

diff --git a/.gitignore b/.gitignore
index 94bb54c661..ccb2299582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,6 @@ tags
 
 # Files generated by the tests
 /src/nvim/testdir/del
-/src/nvim/testdir/mbyte.vim
-/src/nvim/testdir/small.vim
-/src/nvim/testdir/tiny.vim
 /src/nvim/testdir/test*.out
 /src/nvim/testdir/test.log
 /src/nvim/testdir/messages
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 15ba5d15f8..2fba6dd563 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -97,7 +97,7 @@ test1.out: $(VIMPROG)
 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) test1.out
 
 RM_ON_RUN   := test.out X* viminfo
-RM_ON_START := tiny.vim small.vim mbyte.vim test.ok
+RM_ON_START := test.ok
 RUN_VIM     := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(VIMPROG) -u unix.vim -U NONE -i viminfo --noplugin -s dotest.in
 
 clean:
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 6601dcf52f..5b34b4fc31 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -20,9 +20,6 @@
 " If cleanup after each Test_ function is needed, define a TearDown function.
 " It will be called after each Test_ function.
 
-" Without the +eval feature we can't run these tests, bail out.
-so small.vim
-
 " Check that the screen size is at least 24 x 80 characters.
 if &lines < 24 || &columns < 80 
   let error = 'Screen size too small! Tests require at least 24 lines with 80 characters'
diff --git a/src/nvim/testdir/test1.in b/src/nvim/testdir/test1.in
index 85ff1b4db2..272500cd25 100644
--- a/src/nvim/testdir/test1.in
+++ b/src/nvim/testdir/test1.in
@@ -1,20 +1,5 @@
-
 First a simple test to check if the test script works.
 
-If Vim was not compiled with the +eval feature, the small.vim script will be
-set to copy the test.ok file to test.out, so that it looks like the test
-succeeded.  Otherwise an empty small.vim is written.  small.vim is sourced by
-tests that require the +eval feature or other features that are missing in the
-small version.
-
-If Vim was not compiled with the +windows feature, the tiny.vim script will be
-set like small.vim above.  tiny.vim is sourced by tests that require the
-+windows feature or other features that are missing in the tiny version.
-
-If Vim was not compiled with the +multi_byte feature, the mbyte.vim script will
-be set like small.vim above.  mbyte.vim is sourced by tests that require the
-+multi_byte feature.
-
 STARTTEST
 :" If columns or lines are too small, create wrongtermsize.
 :" (Some tests will fail. When columns and/or lines are small)
@@ -23,25 +8,6 @@ STARTTEST
 :" Write a single line to test.out to check if testing works at all.
 :%d
 athis is a test:w! test.out
-:" Create small.vim and tiny.vim empty, create mbyte.vim to skip the test.
-0D:w! small.vim
-:w! tiny.vim
-ae! test.ok
-w! test.out
-qa!
-:w! mbyte.vim
-:"
-:" If +multi_byte feature supported, make mbyte.vim empty.
-:if has("multi_byte") | sp another | w! mbyte.vim | q | endif
-:"
-:" If +eval feature supported quit here, leaving tiny.vim and small.vim empty.
-:" Otherwise write small.vim to skip the test.
-:if 1 | q! | endif
-:w! small.vim
-:" If +windows feature not supported :sp will fail and tiny.vim will be
-:" written to skip the test.
-:sp another
-:wq! tiny.vim
 :qa!
 ENDTEST
 
diff --git a/src/nvim/testdir/test10.in b/src/nvim/testdir/test10.in
index 769d690acb..2178cf41ce 100644
--- a/src/nvim/testdir/test10.in
+++ b/src/nvim/testdir/test10.in
@@ -1,9 +1,6 @@
 Test for 'errorformat'.  This will fail if the quickfix feature was disabled.
 
 STARTTEST
-:so small.vim
-:" Also test a BOM is ignored.
-:so mbyte.vim
 :7/start of errorfile/,/end of errorfile/w! Xerrorfile1
 :7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2
 :/start of testfile/,/end of testfile/w! Xtestfile
diff --git a/src/nvim/testdir/test10a.in b/src/nvim/testdir/test10a.in
index 19e8652fe5..99a5a03db8 100644
--- a/src/nvim/testdir/test10a.in
+++ b/src/nvim/testdir/test10a.in
@@ -1,7 +1,6 @@
 Test for 'errorformat'.
 
 STARTTEST
-:so small.vim
 :/start of errorfile/,/end of errorfile/w! Xerrorfile
 :/start of testfile/,/end of testfile/w! Xtestfile
 :cf Xerrorfile
diff --git a/src/nvim/testdir/test12.in b/src/nvim/testdir/test12.in
index be3169a625..0c0623e5d4 100644
--- a/src/nvim/testdir/test12.in
+++ b/src/nvim/testdir/test12.in
@@ -4,7 +4,6 @@ Tests for 'directory' option.
 - "dir", in directory relative to current dir
 
 STARTTEST
-:so small.vim
 :set dir=.,~
 :/start of testfile/,/end of testfile/w! Xtest1
 :" do an ls of the current dir to find the swap file (should not be there)
diff --git a/src/nvim/testdir/test13.in b/src/nvim/testdir/test13.in
index 6713f80e88..fa9ba312b7 100644
--- a/src/nvim/testdir/test13.in
+++ b/src/nvim/testdir/test13.in
@@ -11,7 +11,6 @@ Also test changing buffers in a BufDel autocommand.  If this goes wrong there
 are ml_line errors and/or a Crash.
 
 STARTTEST
-:so small.vim
 :/^start of testfile/,/^end of testfile/w! Xtestje1
 :/^start of testfile/,/^end of testfile/w! Xtestje2
 :/^start of testfile/,/^end of testfile/w! Xtestje3
diff --git a/src/nvim/testdir/test14.in b/src/nvim/testdir/test14.in
index 6ebec99af6..bef2e45431 100644
--- a/src/nvim/testdir/test14.in
+++ b/src/nvim/testdir/test14.in
@@ -5,7 +5,6 @@ Also test "[m", "]m", "[M" and "]M"
 Also test search()
 
 STARTTEST
-:so small.vim
 /Start cursor here
 vaBiBD:?Bug?,/Piece/-2w! test.out
 /^- Bug
diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in
index a8c81b832d..83abe17770 100644
--- a/src/nvim/testdir/test17.in
+++ b/src/nvim/testdir/test17.in
@@ -3,7 +3,6 @@ Tests for:
 - ":checkpath!" with various 'include' settings.
 
 STARTTEST
-:so small.vim
 :set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,}
 :function! DeleteDirectory(dir)
 : if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
diff --git a/src/nvim/testdir/test30.in b/src/nvim/testdir/test30.in
index 2a89eac73d..56d5d5c6c2 100644
--- a/src/nvim/testdir/test30.in
+++ b/src/nvim/testdir/test30.in
@@ -3,7 +3,6 @@ Test for a lot of variations of the 'fileformats' option
 Note: This test will fail if "cat" is not available.
 
 STARTTEST
-:so small.vim
 :" first write three test files, one in each format
 :set fileformat=unix
 :set fileformats=
diff --git a/src/nvim/testdir/test32.in b/src/nvim/testdir/test32.in
index 1a73c862d1..76bd9be889 100644
--- a/src/nvim/testdir/test32.in
+++ b/src/nvim/testdir/test32.in
@@ -21,7 +21,6 @@ Test for insert expansion
 * t-expansion
 
 STARTTEST
-:so small.vim
 :se backspace=""
 :se cpt=.,w ff=unix | $-2,$w!Xtestfile | set ff&
 :se cot=
diff --git a/src/nvim/testdir/test34.in b/src/nvim/testdir/test34.in
index 71ee5f63b2..4cb7e9494a 100644
--- a/src/nvim/testdir/test34.in
+++ b/src/nvim/testdir/test34.in
@@ -4,7 +4,6 @@ Also test that a builtin function cannot be replaced.
 Also test for regression when calling arbitrary expression.
 
 STARTTEST
-:so small.vim
 :function Table(title, ...)
 :  let ret = a:title
 :  let idx = 1
diff --git a/src/nvim/testdir/test37.in b/src/nvim/testdir/test37.in
index 8ca1125793..156bf74a10 100644
--- a/src/nvim/testdir/test37.in
+++ b/src/nvim/testdir/test37.in
@@ -1,6 +1,6 @@
 Test for 'scrollbind'. <eralston@computer.org>   Do not add a line below!
 STARTTEST
-:so small.vim
+:
 :set noscrollbind
 :set scrollopt=ver,jump
 :set scrolloff=2
diff --git a/src/nvim/testdir/test40.in b/src/nvim/testdir/test40.in
index ced4572fb8..b0285709e5 100644
--- a/src/nvim/testdir/test40.in
+++ b/src/nvim/testdir/test40.in
@@ -1,7 +1,6 @@
 Test for "*Cmd" autocommands
 
 STARTTEST
-:so small.vim
 :set wildchar=^E
 :/^start/,$w! Xxx		" write lines below to Xxx
 :au BufReadCmd XtestA 0r Xxx|$del
diff --git a/src/nvim/testdir/test42.in b/src/nvim/testdir/test42.in
index c35569a76c..0ea0198d12 100644
--- a/src/nvim/testdir/test42.in
+++ b/src/nvim/testdir/test42.in
diff --git a/src/nvim/testdir/test47.in b/src/nvim/testdir/test47.in
index f15eaf0f8f..c95c6a6850 100644
--- a/src/nvim/testdir/test47.in
+++ b/src/nvim/testdir/test47.in
@@ -3,7 +3,6 @@ Tests for vertical splits and filler lines in diff mode
 Also tests restoration of saved options by :diffoff.
 
 STARTTEST
-:so small.vim
 :" Disable the title to avoid xterm keeping the wrong one.
 :set notitle noicon
 /^1
diff --git a/src/nvim/testdir/test48.in b/src/nvim/testdir/test48.in
index 998e1bba00..1df5a3c46a 100644
--- a/src/nvim/testdir/test48.in
+++ b/src/nvim/testdir/test48.in
@@ -1,7 +1,6 @@
 This is a test of 'virtualedit'.
 
 STARTTEST
-:so small.vim
 :set noswf
 :set ve=all
 j-dgg
diff --git a/src/nvim/testdir/test49.in b/src/nvim/testdir/test49.in
index d95052e14c..435e62765b 100644
--- a/src/nvim/testdir/test49.in
+++ b/src/nvim/testdir/test49.in
@@ -4,7 +4,6 @@ If after adding a new test, the test output doesn't appear properly in
 test49.failed, try to add one or more "G"s at the line ending in "test.out"
 
 STARTTEST
-:so small.vim
 :se nomore
 :lang mess C
 :so test49.vim
diff --git a/src/nvim/testdir/test50.in b/src/nvim/testdir/test50.in
index 0cbf4bf6d6..392177b808 100644
--- a/src/nvim/testdir/test50.in
+++ b/src/nvim/testdir/test50.in
@@ -2,7 +2,6 @@ Test for shortpathname ':8' extension.
 Only for use on Win32 systems!
 
 STARTTEST
-:so small.vim
 :fun! TestIt(file, bits, expected)
 	let res=fnamemodify(a:file,a:bits)
 	if a:expected == ''
diff --git a/src/nvim/testdir/test52.in b/src/nvim/testdir/test52.in
index 206b65a1f9..fa75129193 100644
--- a/src/nvim/testdir/test52.in
+++ b/src/nvim/testdir/test52.in
@@ -1,7 +1,6 @@
 Tests for reading and writing files with conversion for Win32.
 
 STARTTEST
-:so mbyte.vim
 :" make this a dummy test for non-Win32 systems
 :if !has("win32") | e! test.ok | wq! test.out | endif
 :"
diff --git a/src/nvim/testdir/test53.in b/src/nvim/testdir/test53.in
index 7c35b2e853..f3778c5192 100644
--- a/src/nvim/testdir/test53.in
+++ b/src/nvim/testdir/test53.in
@@ -7,7 +7,6 @@ Also test match() and matchstr()
 Also test the gn command and repeating it.
 
 STARTTEST
-:so small.vim
 /^start:/
 da"
 0va'a'rx
diff --git a/src/nvim/testdir/test55.in b/src/nvim/testdir/test55.in
index 9e3c1168cc..9a55eac6f6 100644
--- a/src/nvim/testdir/test55.in
+++ b/src/nvim/testdir/test55.in
@@ -1,7 +1,6 @@
 Tests for List and Dictionary types.     vim: set ft=vim :
 
 STARTTEST
-:so small.vim
 :fun Test(...)
 :lang C
 :" Creating List directly with different types
diff --git a/src/nvim/testdir/test64.in b/src/nvim/testdir/test64.in
index fd19d3af32..c4585ecbce 100644
--- a/src/nvim/testdir/test64.in
+++ b/src/nvim/testdir/test64.in
@@ -5,7 +5,6 @@ A pattern that gives the expected result produces OK, so that we know it was
 actually tried.
 
 STARTTEST
-:so small.vim
 :" tl is a List of Lists with:
 :"    regexp engine
 :"    regexp pattern
diff --git a/src/nvim/testdir/test69.in b/src/nvim/testdir/test69.in
index f583947dfb..39b360fc81 100644
--- a/src/nvim/testdir/test69.in
+++ b/src/nvim/testdir/test69.in
@@ -4,7 +4,7 @@ And test "ra" on multi-byte characters.
 Also test byteidx() and byteidxcomp()
 
 STARTTEST
-:so mbyte.vim
+:
 ENDTEST
 
 Results of test69:
diff --git a/src/nvim/testdir/test73.in b/src/nvim/testdir/test73.in
index c525e51d28..7d6c7287a5 100644
--- a/src/nvim/testdir/test73.in
+++ b/src/nvim/testdir/test73.in
@@ -1,7 +1,6 @@
 Tests for find completion.
 
 STARTTEST
-:so small.vim
 :set wildmode=full
 :" Do all test in a separate window to avoid E211 when we recursively
 :" delete the Xfind directory during cleanup
diff --git a/src/nvim/testdir/test8.in b/src/nvim/testdir/test8.in
index 41e6262e92..a5e6034782 100644
--- a/src/nvim/testdir/test8.in
+++ b/src/nvim/testdir/test8.in
@@ -2,7 +2,6 @@ Test for BufWritePre autocommand that deletes or unloads the buffer.
 Test for BufUnload autocommand that unloads all other buffers.
 
 STARTTEST
-:so small.vim
 :au BufWritePre Xxx1 bunload
 :au BufWritePre Xxx2 bwipe
 /^start of
@@ -35,8 +34,6 @@ endfunc
 :set shada='100
 :au BufUnload * call CloseAll()
 :au VimLeave * call WriteToOut()
-:e small.vim
-:sp mbyte.vim
 :q
 :qa!
 ENDTEST
diff --git a/src/nvim/testdir/test_listlbr.in b/src/nvim/testdir/test_listlbr.in
index 6084711786..b5bac080ee 100644
--- a/src/nvim/testdir/test_listlbr.in
+++ b/src/nvim/testdir/test_listlbr.in
@@ -1,7 +1,6 @@
 Test for linebreak and list option (non-utf8)
 
 STARTTEST
-:so small.vim
 :if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
 :set wildchar=^E
 :10new|:vsp|:vert resize 20
diff --git a/test/benchmark/bench_re_freeze_spec.lua b/test/benchmark/bench_re_freeze_spec.lua
index d40d9f9ece..a194b5f44c 100644
--- a/test/benchmark/bench_re_freeze_spec.lua
+++ b/test/benchmark/bench_re_freeze_spec.lua
@@ -25,8 +25,8 @@ local measure_script = [[
     endfunc]]
 
 describe('regexp search', function()
-  -- The test cases rely on a small Vim script, which we source here, and also
-  -- on a temporary result file, which we prepare and write to disk.
+  -- The test cases rely on a temporary result file, which we prepare and write
+  -- to disk.
   setup(function()
     clear()
     source(measure_script)