diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-31 14:17:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-31 14:17:27 +0200 |
| commit | 89eaa4185efacab253b23a182c1c8a7bbf1096c9 (patch) | |
| tree | cb8ed611f3dfdd5bf9687cd89b2bd3ab91dad5ef /src/testdir | |
| parent | b54c3ff3174dbb5dfbfcabdf95200b047beaa644 (diff) | |
| download | vim-89eaa4185efacab253b23a182c1c8a7bbf1096c9.zip | |
patch 7.4.2135
Problem: Various tiny issues.
Solution: Update comments, white space, etc.
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/Makefile | 16 | ||||
| -rw-r--r-- | src/testdir/test80.in | 4 | ||||
| -rw-r--r-- | src/testdir/test_channel.vim | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 129ecaf6c..5c629ed3f 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -80,14 +80,14 @@ test1.out: test1.in @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" -$(RUN_VIM) $*.in - # For flaky tests retry one time. - @/bin/sh -c "if test -f test.out -a $* = test61; then \ - if diff test.out $*.ok; \ - then echo flaky test ok first time; \ - else rm -rf $*.failed $(RM_ON_RUN); \ - $(RUN_VIM) $*.in; \ - fi \ - fi" + # For flaky tests retry one time. No tests at the moment. + #@/bin/sh -c "if test -f test.out -a $* = test61; then \ + # if diff test.out $*.ok; \ + # then echo flaky test ok first time; \ + # else rm -rf $*.failed $(RM_ON_RUN); \ + # $(RUN_VIM) $*.in; \ + # fi \ + # fi" # Check if the test.out file matches test.ok. @/bin/sh -c "if test -f test.out; then \ diff --git a/src/testdir/test80.in b/src/testdir/test80.in index 406fb6dac..e78e92118 100644 --- a/src/testdir/test80.in +++ b/src/testdir/test80.in @@ -1,5 +1,5 @@ -Test for *sub-replace-special* and *sub-replace-expression* on substitue(). -Test for submatch() on substitue(). +Test for *sub-replace-special* and *sub-replace-expression* on substitute(). +Test for submatch() on substitute(). Test for *:s%* on :substitute. STARTTEST diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 48ab69c75..fff9ebd6c 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1320,7 +1320,7 @@ func Test_collapse_buffers() 1,$delete call job_start('cat test_channel.vim', {'out_io': 'buffer', 'out_name': 'testout'}) call WaitFor('line("$") > g:linecount') - call assert_true(line('$') > g:linecount) + call assert_inrange(g:linecount + 1, g:linecount + 2, line('$')) bwipe! endfunc |