patch 7.4.2135
Problem: Various tiny issues.
Solution: Update comments, white space, etc.
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 129ecaf..5c629ed 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -80,14 +80,14 @@
@-/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 406fb6d..e78e921 100644
--- a/src/testdir/test80.in
+++ b/src/testdir/test80.in
Binary files differ
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 48ab69c..fff9ebd 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1320,7 +1320,7 @@
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