diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-02-04 09:23:54 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-02-04 09:23:54 +0800 |
| commit | 1e0613f58c7ebf7e1f9a8014cc672cd1ef0b4f47 (patch) | |
| tree | f402644d4b76709ba823538c12b8fa4e07d565d8 | |
| parent | 5a9e5b6c385d6f24551812ba37710071ad3e78d4 (diff) | |
| download | rneovim-1e0613f58c7ebf7e1f9a8014cc672cd1ef0b4f47.tar.gz rneovim-1e0613f58c7ebf7e1f9a8014cc672cd1ef0b4f47.tar.bz2 rneovim-1e0613f58c7ebf7e1f9a8014cc672cd1ef0b4f47.zip | |
vim-patch:8.1.2358: tests fail on Cirrus CI for FreeBSD
Problem: Tests fail on Cirrus CI for FreeBSD.
Solution: Fix a test and skip some. (Christian Brabandt, closes vim/vim#5281)
https://github.com/vim/vim/commit/9134f1ecd41207045db3cb47f0269497980395ad
Skip test_normal.vim: already applied in #11483.
| -rw-r--r-- | src/nvim/testdir/check.vim | 9 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_source_utf8.vim | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_utf8_comparisons.vim | 5 |
4 files changed, 18 insertions, 1 deletions
diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index ab26dddbe0..76c0f7d422 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -63,6 +63,15 @@ func CheckUnix() endif endfunc +" Command to check for not running on a BSD system. +" TODO: using this checks should not be needed +command CheckNotBSD call CheckNotBSD() +func CheckNotBSD() + if has('bsd') + throw 'Skipped: does not work on BSD' + endif +endfunc + " Command to check that making screendumps is supported. " Caller must source screendump.vim command CheckScreendump call CheckScreendump() diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index 6db679c5f9..5cb0354dce 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -1789,6 +1789,7 @@ func s:create_test_file(filename) endfunc func Test_switchbuf() + CheckNotBSD call s:create_test_file('Xqftestfile1') call s:create_test_file('Xqftestfile2') call s:create_test_file('Xqftestfile3') diff --git a/src/nvim/testdir/test_source_utf8.vim b/src/nvim/testdir/test_source_utf8.vim index e93ea29dff..99cb09c50e 100644 --- a/src/nvim/testdir/test_source_utf8.vim +++ b/src/nvim/testdir/test_source_utf8.vim @@ -1,7 +1,10 @@ " Test the :source! command +source check.vim func Test_source_utf8() " check that sourcing a script with 0x80 as second byte works + " does not work correctly on BSD + CheckNotBSD new call setline(1, [':%s/àx/--à1234--/g', ':%s/Àx/--À1234--/g']) write! Xscript @@ -31,6 +34,7 @@ endfunc " Test for sourcing a file with CTRL-V's at the end of the line func Test_source_ctrl_v() + CheckNotBSD call writefile(['map __1 afirst', \ 'map __2 asecond', \ 'map __3 athird', diff --git a/src/nvim/testdir/test_utf8_comparisons.vim b/src/nvim/testdir/test_utf8_comparisons.vim index fdf9d80802..62947c6e6e 100644 --- a/src/nvim/testdir/test_utf8_comparisons.vim +++ b/src/nvim/testdir/test_utf8_comparisons.vim @@ -86,6 +86,9 @@ endfunc " test that g~ap changes one paragraph only. func Test_gap() new - call feedkeys("iabcd\n\ndefggg0g~ap", "tx") + " setup text + call feedkeys("iabcd\<cr>\<cr>defg", "tx") + " modify only first line + call feedkeys("gg0g~ap", "tx") call assert_equal(["ABCD", "", "defg"], getline(1,3)) endfunc |