Mercurial > vim
diff src/testdir/test_eval.in @ 6563:6b86d256fd33 v7.4.608
updated for version 7.4.608
Problem: test_eval fails when the clipboard feature is missing.
Solution: Skip part of the test. Reduce the text used.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Tue, 27 Jan 2015 22:52:15 +0100 |
parents | b01ca71f93b2 |
children | 75238dbe8543 |
line wrap: on
line diff
--- a/src/testdir/test_eval.in +++ b/src/testdir/test_eval.in @@ -2,13 +2,19 @@ Test for various eval features. vim: s Note: system clipboard is saved, changed and restored. +clipboard contents +something else + STARTTEST :so small.vim :set encoding=latin1 :set noswapfile :lang C :fun AppendRegContents(reg) - call append('$', printf('%s: type %s; value: %s (%s), expr: %s (%s)', a:reg, getregtype(a:reg), getreg(a:reg), string(getreg(a:reg, 0, 1)), getreg(a:reg, 1), string(getreg(a:reg, 1, 1)))) + call AppendRegParts(a:reg, getregtype(a:reg), getreg(a:reg), string(getreg(a:reg, 0, 1)), getreg(a:reg, 1), string(getreg(a:reg, 1, 1))) +:endfun +:fun AppendRegParts(reg, type, cont, strcont, cont1, strcont1) + call append('$', printf('%s: type %s; value: %s (%s), expr: %s (%s)', a:reg, a:type, a:cont, a:strcont, a:cont1, a:strcont1)) endfun :command -nargs=? AR :call AppendRegContents(<q-args>) :fun SetReg(...) @@ -122,18 +128,23 @@ call SetReg('/', ["abc/\n"]) call SetReg('=', ['"abc/"']) call SetReg('=', ["\"abc/\n\""]) $put ='{{{1 System clipboard' +if has('clipboard') " Save and restore system clipboard. " If no connection to X-Server is possible, test should succeed. -:let _clipreg = ['+', getreg('+'), getregtype('+')] -:let _clipopt = &cb -:let &cb='unnamedplus' -:1y -:AR + -:tabdo :windo :echo "hi" -:3y -:AR + -:let &cb=_clipopt -:call call('setreg', _clipreg) +let _clipreg = ['+', getreg('+'), getregtype('+')] +let _clipopt = &cb +let &cb='unnamedplus' +5y +AR + +tabdo :windo :echo "hi" +6y +AR + +let &cb=_clipopt +call call('setreg', _clipreg) +else + call AppendRegParts('+', 'V', "clipboard contents\n", "['clipboard contents']", "clipboard contents\n", "['clipboard contents']") + call AppendRegParts('+', 'V', "something else\n", "['something else']", "something else\n", "['something else']") +endif $put ='{{{1 Errors' call ErrExe('call setreg()') call ErrExe('call setreg(1)')