summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-08 22:55:19 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-08 22:55:19 +0100
commitc3c766ea8c35f5b2bd45fb3d74d0ae46b2d8c24f (patch)
treeebb3661d41d6e38f638e7f14e0f47a64e29122df
parent12d1dc9155a507f2bbffae19696c33a640fbc8d1 (diff)
downloadvim-git-8.0.0433.tar.gz
patch 8.0.0433: beeps when running testsv8.0.0433
Problem: Quite a few beeps when running tests. Solution: Set 'belloff' for these tests. (Christian Brabandt)
-rw-r--r--src/testdir/test103.in1
-rw-r--r--src/testdir/test14.in1
-rw-r--r--src/testdir/test29.in1
-rw-r--r--src/testdir/test30.in1
-rw-r--r--src/testdir/test32.in1
-rw-r--r--src/testdir/test45.in1
-rw-r--r--src/testdir/test72.in2
-rw-r--r--src/testdir/test73.in1
-rw-r--r--src/testdir/test77.in1
-rw-r--r--src/testdir/test78.in2
-rw-r--r--src/testdir/test85.in1
-rw-r--r--src/testdir/test94.in1
-rw-r--r--src/testdir/test_alot.vim1
-rw-r--r--src/testdir/test_alot_utf8.vim1
-rw-r--r--src/testdir/test_close_count.in1
-rw-r--r--src/testdir/test_cmdline.vim2
-rw-r--r--src/testdir/test_diffmode.vim1
-rw-r--r--src/testdir/test_digraph.vim1
-rw-r--r--src/testdir/test_erasebackword.in1
-rw-r--r--src/testdir/test_normal.vim1
-rw-r--r--src/testdir/test_packadd.vim2
-rw-r--r--src/testdir/test_search.vim1
-rw-r--r--src/testdir/test_textobjects.vim1
-rw-r--r--src/testdir/test_undo.vim1
-rw-r--r--src/testdir/test_usercommands.vim1
-rw-r--r--src/testdir/test_visual.vim2
-rw-r--r--src/version.c2
27 files changed, 31 insertions, 2 deletions
diff --git a/src/testdir/test103.in b/src/testdir/test103.in
index 7c7591e3b..a4c80844a 100644
--- a/src/testdir/test103.in
+++ b/src/testdir/test103.in
@@ -1,6 +1,7 @@
Test for visual mode not being reset causing E315 error.
STARTTEST
:so small.vim
+:set belloff=all
:enew
:let g:msg="Everything's fine."
:function! TriggerTheProblem()
diff --git a/src/testdir/test14.in b/src/testdir/test14.in
index fb987ebc8..3fc39fe4d 100644
--- a/src/testdir/test14.in
+++ b/src/testdir/test14.in
@@ -6,6 +6,7 @@ Also test search()
STARTTEST
:so small.vim
+:set belloff=all
/Start cursor here
vaBiBD:?Bug?,/Piece/-2w! test.out
/^- Bug
diff --git a/src/testdir/test29.in b/src/testdir/test29.in
index 65e28c1c5..366a551a2 100644
--- a/src/testdir/test29.in
+++ b/src/testdir/test29.in
@@ -103,6 +103,7 @@ if (condition) // Remove the next comment leader!
STARTTEST
:" Test with backspace set to the non-compatible setting
+:set belloff=all
/^\d\+ this
:set cp bs=2
Avim1
diff --git a/src/testdir/test30.in b/src/testdir/test30.in
index 70bedc503..df494048e 100644
--- a/src/testdir/test30.in
+++ b/src/testdir/test30.in
@@ -4,6 +4,7 @@ Note: This test will fail if "cat" is not available.
STARTTEST
:so small.vim
+:set belloff=all
:" first write three test files, one in each format
:set fileformat=unix
:set fileformats=
diff --git a/src/testdir/test32.in b/src/testdir/test32.in
index 6b399fa6c..602d9e551 100644
--- a/src/testdir/test32.in
+++ b/src/testdir/test32.in
@@ -23,6 +23,7 @@ Test for insert expansion
STARTTEST
:so small.vim
:se nocp viminfo+=nviminfo cpt=.,w ff=unix | $-2,$w!Xtestfile | set ff&
+:set belloff=all
:se cot=
nO#include "Xtestfile"
ru
diff --git a/src/testdir/test45.in b/src/testdir/test45.in
index b1e8266ab..751e1378f 100644
--- a/src/testdir/test45.in
+++ b/src/testdir/test45.in
@@ -2,6 +2,7 @@ Tests for folding. vim: set ft=vim :
STARTTEST
:so small.vim
+:set belloff=all
:" We also need the +syntax feature here.
:if !has("syntax")
e! test.ok
diff --git a/src/testdir/test72.in b/src/testdir/test72.in
index a407eea4e..961df4c5d 100644
--- a/src/testdir/test72.in
+++ b/src/testdir/test72.in
@@ -4,6 +4,7 @@ undo-able pieces. Do that by setting 'undolevels'.
STARTTEST
:so small.vim
+:set belloff=all
:"
:" Test 'undofile': first a simple one-line change.
:set nocompatible viminfo+=nviminfo visualbell
@@ -25,7 +26,6 @@ u:.w! test.out
:set undofile
:bwipe!
:e Xtestfile
-:" TODO: this beeps
u:.w >>test.out
:"
:" Test 'undofile', add 10 lines, delete 6 lines, undo 3
diff --git a/src/testdir/test73.in b/src/testdir/test73.in
index a0b9ae8a1..67fe4551d 100644
--- a/src/testdir/test73.in
+++ b/src/testdir/test73.in
@@ -2,6 +2,7 @@ Tests for find completion.
STARTTEST
:so small.vim
+:set belloff=all
:" Do all test in a separate window to avoid E211 when we recursively
:" delete the Xfind directory during cleanup
:"
diff --git a/src/testdir/test77.in b/src/testdir/test77.in
index 0dbc4fcba..55a1c3027 100644
--- a/src/testdir/test77.in
+++ b/src/testdir/test77.in
@@ -10,6 +10,7 @@ If it isn't available then the test will be skipped.
STARTTEST
:so small.vim
+:set belloff=all
:if !executable("cksum")
: e! test.ok
: w! test.out
diff --git a/src/testdir/test78.in b/src/testdir/test78.in
index 1850bd923..e97f4a469 100644
--- a/src/testdir/test78.in
+++ b/src/testdir/test78.in
@@ -6,7 +6,7 @@ blocks.
STARTTEST
:so small.vim
-:set nocp fileformat=unix undolevels=-1 viminfo+=nviminfo
+:set nocp fileformat=unix undolevels=-1 viminfo+=nviminfo belloff=all
:e! Xtest
ggdG
:let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
diff --git a/src/testdir/test85.in b/src/testdir/test85.in
index c5ca873a4..0a1339475 100644
--- a/src/testdir/test85.in
+++ b/src/testdir/test85.in
@@ -2,6 +2,7 @@ Test for Lua interface and luaeval() function
STARTTEST
:so small.vim
+:set belloff=all
:so lua.vim
:set nocompatible viminfo+=nviminfo
:lua l = vim.list():add"item0":add"dictionary with list OK":add"item2"
diff --git a/src/testdir/test94.in b/src/testdir/test94.in
index 238fef374..447fd2bee 100644
--- a/src/testdir/test94.in
+++ b/src/testdir/test94.in
@@ -17,6 +17,7 @@ Test cases:
STARTTEST
:so small.vim
+:set belloff=all
:set enc=utf-8 nocp viminfo+=nviminfo
:
:" User functions
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 4ccff8a90..8cbd60140 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -1,6 +1,7 @@
" A series of tests that can run in one Vim invocation.
" This makes testing go faster, since Vim doesn't need to restart.
+set belloff=all
source test_assign.vim
source test_autocmd.vim
source test_changedtick.vim
diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim
index 90b2aab46..3022da334 100644
--- a/src/testdir/test_alot_utf8.vim
+++ b/src/testdir/test_alot_utf8.vim
@@ -5,6 +5,7 @@
" runtest.vim. Checking for the multi_byte feature is in the individual
" files, so that they can be run by themselves.
+set belloff=all
source test_expr_utf8.vim
source test_matchadd_conceal_utf8.vim
source test_regexp_utf8.vim
diff --git a/src/testdir/test_close_count.in b/src/testdir/test_close_count.in
index f07da99b0..f40fd2361 100644
--- a/src/testdir/test_close_count.in
+++ b/src/testdir/test_close_count.in
@@ -2,6 +2,7 @@ Tests for :[count]close! and :[count]hide vim: set ft=vim :
STARTTEST
:so small.vim
+:set belloff=all
:let tests = []
:for i in range(5)
:new
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 8d5ae286e..98a433778 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1,5 +1,7 @@
" Tests for editing the command line.
+set belloff=all
+
func Test_complete_tab()
call writefile(['testfile'], 'Xtestfile')
call feedkeys(":e Xtest\t\r", "tx")
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 33617c9cb..73f944bce 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -1,4 +1,5 @@
" Tests for diff mode
+set belloff=all
func Test_diff_fold_sync()
enew!
diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
index 629068030..30dc9a468 100644
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -3,6 +3,7 @@
if !has("digraphs") || !has("multi_byte")
finish
endif
+set belloff=all
func! Put_Dig(chars)
exe "norm! o\<c-k>".a:chars
diff --git a/src/testdir/test_erasebackword.in b/src/testdir/test_erasebackword.in
index 1ddcd3cc2..36dd23254 100644
--- a/src/testdir/test_erasebackword.in
+++ b/src/testdir/test_erasebackword.in
@@ -2,6 +2,7 @@ Test for erasing backword
STARTTEST
:so small.vim
+:set belloff=all
:so mbyte.vim
:set encoding=utf-8
G
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 3af79f8d0..e0df0ae1e 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1,5 +1,6 @@
" Test for various Normal mode commands
+set belloff=all
func! Setup_NewWindow()
10new
call setline(1, range(1,100))
diff --git a/src/testdir/test_packadd.vim b/src/testdir/test_packadd.vim
index 8ffebf9bf..9d4c6d8fe 100644
--- a/src/testdir/test_packadd.vim
+++ b/src/testdir/test_packadd.vim
@@ -1,5 +1,7 @@
" Tests for 'packpath' and :packadd
+set belloff=all
+
func SetUp()
let s:topdir = expand('%:h') . '/Xdir'
exe 'set packpath=' . s:topdir
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 1a114c44c..7f4f7e0ec 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1,5 +1,6 @@
" Test for the search command
+set belloff=all
func Test_search_cmdline()
if !exists('+incsearch')
return
diff --git a/src/testdir/test_textobjects.vim b/src/testdir/test_textobjects.vim
index 630ae5d3a..5e67f2528 100644
--- a/src/testdir/test_textobjects.vim
+++ b/src/testdir/test_textobjects.vim
@@ -4,6 +4,7 @@ if !has('textobjects')
finish
endif
+set belloff=all
function! CpoM(line, useM, expected)
new
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index 06732af71..e785c605d 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -3,6 +3,7 @@
" undo-able pieces. Do that by setting 'undolevels'.
" Also tests :earlier and :later.
+set belloff=all
func Test_undotree()
exe "normal Aabc\<Esc>"
set ul=100
diff --git a/src/testdir/test_usercommands.vim b/src/testdir/test_usercommands.vim
index 9420321ac..29db51f0a 100644
--- a/src/testdir/test_usercommands.vim
+++ b/src/testdir/test_usercommands.vim
@@ -1,6 +1,7 @@
" Tests for user defined commands
" Test for <mods> in user defined commands
+set belloff=all
function Test_cmdmods()
let g:mods = ''
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index 227da87f8..371fab57a 100644
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -3,6 +3,8 @@ if !has('visual')
finish
endif
+set belloff=all
+
func Test_block_shift_multibyte()
" Uses double-wide character.
if !has('multi_byte')
diff --git a/src/version.c b/src/version.c
index 3415d229c..cbb1bba28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 433,
+/**/
432,
/**/
431,