diff --git a/.gitignore b/.gitignore index 78db2fa75f..00d422692d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,6 @@ # Files generated by the tests /src/nvim/testdir/del /src/nvim/testdir/mbyte.vim -/src/nvim/testdir/mzscheme.vim /src/nvim/testdir/lua.vim /src/nvim/testdir/small.vim /src/nvim/testdir/tiny.vim diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index be76206bfc..aff22f33dd 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -22,7 +22,7 @@ SCRIPTS := test_autoformat_join.out \ test52.out test53.out test55.out \ test57.out test58.out test59.out test60.out \ test61.out test62.out test63.out test64.out test65.out \ - test68.out test69.out test70.out \ + test68.out test69.out \ test71.out test73.out test74.out \ test76.out test78.out test79.out test80.out \ test82.out test83.out test85.out \ @@ -85,7 +85,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 mzscheme.vim lua.vim test.ok +RM_ON_START := tiny.vim small.vim mbyte.vim lua.vim 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/test1.in b/src/nvim/testdir/test1.in index 735d539673..4875c9173d 100644 --- a/src/nvim/testdir/test1.in +++ b/src/nvim/testdir/test1.in @@ -14,7 +14,6 @@ set like small.vim above. tiny.vim is sourced by tests that require the 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. -Similar logic is applied to the +mzscheme feature, using mzscheme.vim. Similar logic is applied to the +lua feature, using lua.vim. STARTTEST @@ -32,15 +31,11 @@ ae! test.ok w! test.out qa! :w! mbyte.vim -:w! mzscheme.vim :w! lua.vim :" :" If +multi_byte feature supported, make mbyte.vim empty. :if has("multi_byte") | sp another | w! mbyte.vim | q | endif :" -:" If +mzscheme feature supported, make mzscheme.vim empty. -:if has("mzscheme") | sp another | w! mzscheme.vim | q | endif -:" :" If +lua feature supported, make lua.vim empty. :if has("lua") | sp another | w! lua.vim | q | endif :" diff --git a/src/nvim/testdir/test70.in b/src/nvim/testdir/test70.in deleted file mode 100644 index 24d2e4c446..0000000000 --- a/src/nvim/testdir/test70.in +++ /dev/null @@ -1,62 +0,0 @@ -Smoke test for MzScheme interface and mzeval() function - -STARTTEST -:so mzscheme.vim -:function! MzRequire() -:redir => l:mzversion -:mz (version) -:redir END -:if strpart(l:mzversion, 1, 1) < "4" -:" MzScheme versions < 4.x: -:mz (require (prefix vim- vimext)) -:else -:" newer versions: -:mz (require (prefix-in vim- 'vimext)) -:mz (require r5rs) -:endif -:endfunction -:silent call MzRequire() -:mz (define l '("item0" "dictionary with list OK" "item2")) -:mz (define h (make-hash)) -:mz (hash-set! h "list" l) -/^1 -:" change buffer contents -:mz (vim-set-buff-line (vim-eval "line('.')") "1 changed line 1") -:" scalar test -:let tmp_string = mzeval('"string"') -:let tmp_1000 = mzeval('1000') -:if tmp_string . tmp_1000 == "string1000" -:let scalar_res = "OK" -:else -:let scalar_res = "FAILED" -:endif -:call append(search("^1"), "scalar test " . scalar_res) -:" dictionary containing a list -:let tmp = mzeval("h")["list"][1] -:/^2/put =tmp -:" circular list (at the same time test lists containing lists) -:mz (set-car! (cddr l) l) -:let l2 = mzeval("h")["list"] -:if l2[2] == l2 -:let res = "OK" -:else -:let res = "FAILED: " . l2[2] -:endif -:call setline(search("^3"), "circular test " . res) -:" funcrefs -:mz (define vim:max (vim-eval "function('max')")) -:mz (define m (vim:max '(1 100 8))) -:let m = mzeval('m') -:if m == 100 -:let fref_res = "OK" -:else -:let fref_res = "FAILED: " . m -:end -:call append(line('$'), 'funcrefs '. fref_res) -:?^1?,$w! test.out -:qa! -ENDTEST - -1 line 1 -2 line 2 -3 line 3 diff --git a/src/nvim/testdir/test70.ok b/src/nvim/testdir/test70.ok deleted file mode 100644 index 9c82a86f2d..0000000000 --- a/src/nvim/testdir/test70.ok +++ /dev/null @@ -1,6 +0,0 @@ -1 changed line 1 -scalar test OK -2 line 2 -dictionary with list OK -circular test OK -funcrefs OK