To: vim_dev@googlegroups.com Subject: Patch 8.1.2358 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2358 Problem: Tests fail on Cirrus CI for FreeBSD. Solution: Fix a test and skip some. (Christian Brabandt, closes #5281) Files: Filelist, .cirrus.yml, src/testdir/check.vim, src/testdir/test_normal.vim, src/testdir/test_quickfix.vim, src/testdir/test_source_utf8.vim, src/testdir/test_terminal.vim, src/testdir/test_utf8_comparisons.vim *** ../vim-8.1.2357/Filelist 2019-11-21 17:13:12.620361368 +0100 --- Filelist 2019-11-27 22:03:40.384751176 +0100 *************** *** 8,13 **** --- 8,14 ---- .hgignore \ .lgtm.yml \ .travis.yml \ + .cirrus.yml \ appveyor.yml \ ci/appveyor.bat \ src/Make_all.mak \ *** ../vim-8.1.2357/.cirrus.yml 2019-11-28 20:53:03.010370472 +0100 --- .cirrus.yml 2019-11-29 20:18:03.244971747 +0100 *************** *** 1,5 **** env: ! #CIRRUS_CLONE_DEPTH: 1 FEATURES: huge freebsd_12_task: --- 1,5 ---- env: ! CIRRUS_CLONE_DEPTH: 3 FEATURES: huge freebsd_12_task: *************** *** 13,16 **** - make -j${NPROC} - src/vim --version test_script: ! - make test --- 13,17 ---- - make -j${NPROC} - src/vim --version test_script: ! # Runtime Indent tests do not work, run only the normal test suite ! - cd src && make test *** ../vim-8.1.2357/src/testdir/check.vim 2019-10-10 16:46:13.590506986 +0200 --- src/testdir/check.vim 2019-11-29 20:22:31.212311202 +0100 *************** *** 64,69 **** --- 64,78 ---- 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() *** ../vim-8.1.2357/src/testdir/test_normal.vim 2019-11-28 21:16:02.317772240 +0100 --- src/testdir/test_normal.vim 2019-11-29 20:21:45.680443806 +0100 *************** *** 1204,1210 **** return endif ! if has('mac') || has('bsd') " In MacOS and BSD, the option for specifying a pager is different set keywordprg=man\ -P\ cat else --- 1204,1211 ---- return endif ! let not_gnu_man = has('mac') || has('bsd') ! if not_gnu_man " In MacOS and BSD, the option for specifying a pager is different set keywordprg=man\ -P\ cat else *************** *** 1213,1219 **** " Test for using man 2 let a = execute('unsilent norm! K') ! if has('mac') call assert_match("man -P cat 'man'", a) else call assert_match("man --pager=cat 'man'", a) --- 1214,1220 ---- " Test for using man 2 let a = execute('unsilent norm! K') ! if not_gnu_man call assert_match("man -P cat 'man'", a) else call assert_match("man --pager=cat 'man'", a) *** ../vim-8.1.2357/src/testdir/test_quickfix.vim 2019-11-24 22:13:53.902251675 +0100 --- src/testdir/test_quickfix.vim 2019-11-29 20:18:03.248971740 +0100 *************** *** 1685,1690 **** --- 1685,1691 ---- endfunc func Test_switchbuf() + CheckNotBSD call s:create_test_file('Xqftestfile1') call s:create_test_file('Xqftestfile2') call s:create_test_file('Xqftestfile3') *** ../vim-8.1.2357/src/testdir/test_source_utf8.vim 2019-01-24 17:59:35.139217458 +0100 --- src/testdir/test_source_utf8.vim 2019-11-29 20:18:03.248971740 +0100 *************** *** 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,36 **** --- 34,40 ---- " 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', *** ../vim-8.1.2357/src/testdir/test_terminal.vim 2019-11-05 22:38:43.845777457 +0100 --- src/testdir/test_terminal.vim 2019-11-29 20:18:03.248971740 +0100 *************** *** 870,875 **** --- 870,876 ---- endfunc func Test_terminal_composing_unicode() + CheckNotBSD let save_enc = &encoding set encoding=utf-8 *** ../vim-8.1.2357/src/testdir/test_utf8_comparisons.vim 2019-01-24 17:59:35.143217444 +0100 --- src/testdir/test_utf8_comparisons.vim 2019-11-29 20:18:03.248971740 +0100 *************** *** 86,91 **** " test that g~ap changes one paragraph only. func Test_gap() new ! call feedkeys("iabcd\n\ndefggg0g~ap", "tx") call assert_equal(["ABCD", "", "defg"], getline(1,3)) endfunc --- 86,94 ---- " test that g~ap changes one paragraph only. func Test_gap() new ! " setup text ! call feedkeys("iabcd\\defg", "tx") ! " modify only first line ! call feedkeys("gg0g~ap", "tx") call assert_equal(["ABCD", "", "defg"], getline(1,3)) endfunc *** ../vim-8.1.2357/src/version.c 2019-11-28 22:55:39.770706378 +0100 --- src/version.c 2019-11-29 20:19:48.464749521 +0100 *************** *** 739,740 **** --- 739,742 ---- { /* Add new patch number below this line */ + /**/ + 2358, /**/ -- Amazing but true: If all the salmon caught in Canada in one year were laid end to end across the Sahara Desert, the smell would be absolutely awful. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///