To: vim_dev@googlegroups.com Subject: Patch 7.4.1614 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1614 Problem: Still quickfix test in old style. Solution: Turn test 10 into a new style test. Files: src/testdir/Make_all.mak, src/testdir/Make_vms.mms, src/testdir/main.aap, src/testdir/test10.in, src/testdir/test10.ok, src/testdir/test_quickfix.vim, src/testdir/test10a.in, src/testdir/test10a.ok *** ../vim-7.4.1613/src/testdir/Make_all.mak 2016-03-17 22:06:49.933452325 +0100 --- src/testdir/Make_all.mak 2016-03-19 22:32:39.803208267 +0100 *************** *** 130,136 **** # Tests that run on most systems, but not on Amiga and DOS/Windows. SCRIPTS_MORE2 = \ test2.out \ - test10.out \ test12.out \ test13.out \ test25.out \ --- 130,135 ---- *** ../vim-7.4.1613/src/testdir/Make_vms.mms 2016-02-25 21:21:47.989840859 +0100 --- src/testdir/Make_vms.mms 2016-03-19 22:32:39.803208267 +0100 *************** *** 109,115 **** .ENDIF .IFDEF WANT_UNIX ! SCRIPT_UNIX = test10.out test12.out test17.out test25.out test27.out test49.out test73.out .ENDIF .IFDEF WANT_WIN --- 109,115 ---- .ENDIF .IFDEF WANT_UNIX ! SCRIPT_UNIX = test12.out test17.out test25.out test27.out test49.out test73.out .ENDIF .IFDEF WANT_WIN *** ../vim-7.4.1613/src/testdir/main.aap 2010-10-20 16:13:35.000000000 +0200 --- src/testdir/main.aap 2016-03-19 22:32:39.803208267 +0100 *************** *** 5,11 **** VimProg ?= ../vim Scripts = test1.out test2.out test3.out test4.out test5.out test6.out ! test7.out test8.out test9.out test10.out test11.out test12.out test13.out test14.out test15.out test17.out test18.out test19.out test20.out test21.out test22.out test23.out test24.out test25.out test26.out test27.out --- 5,11 ---- VimProg ?= ../vim Scripts = test1.out test2.out test3.out test4.out test5.out test6.out ! test7.out test8.out test9.out test11.out test12.out test13.out test14.out test15.out test17.out test18.out test19.out test20.out test21.out test22.out test23.out test24.out test25.out test26.out test27.out *** ../vim-7.4.1613/src/testdir/test10.in 2012-06-01 18:22:40.000000000 +0200 --- src/testdir/test10.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,114 **** - Test for 'errorformat'. This will fail if the quickfix feature was disabled. - - STARTTEST - :so small.vim - :" Also test a BOM is ignored. - :so mbyte.vim - :set encoding=utf-8 - :7/start of errorfile/,/end of errorfile/w! Xerrorfile1 - :7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2 - :/start of testfile/,/end of testfile/w! Xtestfile - :set efm+==%f=\\,\ line\ %l%*\\D%v%*[^\ ]\ %m - :set efm^=%AError\ in\ \"%f\"\ at\ line\ %l:,%Z%p^,%C%m - :cf Xerrorfile2 - :clast - :copen - :let a=w:quickfix_title - :wincmd p - lgR=a  - :cf Xerrorfile1 - grA - :cn - gRLINE 6, COL 19 - :cn - gRNO COLUMN SPECIFIED - :cn - gRAGAIN NO COLUMN - :cn - gRCOL 1 - :cn - gRCOL 2 - :cn - gRCOL 10 - :cn - gRVCOL 10 - :cn - grI - :cn - gR. SPACE POINTER - :cn - gR. DOT POINTER - :cn - gR. DASH POINTER - :cn - gR. TAB-SPACE POINTER - :clast - :cprev - :cprev - :wincmd w - :let a=w:quickfix_title - :wincmd p - lgR=a  - :w! test.out " Write contents of this file - :qa! - ENDTEST - - start of errorfile - "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set. - "Xtestfile", line 6 col 19; this is an error - gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c - Xtestfile:9: parse error before `asd' - make: *** [vim] Error 1 - in file "Xtestfile" linenr 10: there is an error - - 2 returned - "Xtestfile", line 11 col 1; this is an error - "Xtestfile", line 12 col 2; this is another error - "Xtestfile", line 14:10; this is an error in column 10 - =Xtestfile=, line 15:10; this is another error, but in vcol 10 this time - "Xtestfile", linenr 16: yet another problem - Error in "Xtestfile" at line 17: - x should be a dot - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17 - ^ - Error in "Xtestfile" at line 18: - x should be a dot - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18 - .............^ - Error in "Xtestfile" at line 19: - x should be a dot - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19 - --------------^ - Error in "Xtestfile" at line 20: - x should be a dot - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20 - ^ - - Does anyone know what is the problem and how to correction it? - "Xtestfile", line 21 col 9: What is the title of the quickfix window? - "Xtestfile", line 22 col 9: What is the title of the quickfix window? - end of errorfile - - start of testfile - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 4 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 6 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 9 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 10 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 12 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 14 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 15 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 21 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 22 - end of testfile --- 0 ---- *** ../vim-7.4.1613/src/testdir/test10.ok 2012-06-01 18:22:40.000000000 +0200 --- src/testdir/test10.ok 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,23 **** - start of testfile - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3 - xxxxxxxxxxAxxxxxxxxxxxxxxxxxxx line 4 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5 - xxxxxxxxxxxxxxxxxLINE 6, COL 19 line 6 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8 - NO COLUMN SPECIFIEDxxxxxxxxxxx line 9 - AGAIN NO COLUMNxxxxxxxxxxxxxxx line 10 - COL 1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11 - COL 2xxxxxxxxxxxxxxxxxxxxxxxxx line 12 - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13 - xxxxxxxxCOL 10xxxxxxxxxxxxxxxx line 14 - xVCOL 10xxxxxxxxxxxxxxxxxxxxxx line 15 - Ixxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16 - xxxx. SPACE POINTERxxxxxxxxxxx line 17 - xxxxx. DOT POINTERxxxxxxxxxxxx line 18 - xxxxxx. DASH POINTERxxxxxxxxxx line 19 - xxxxxxx. TAB-SPACE POINTERxxxx line 20 - xxxxxxxx:cf Xerrorfile1xxxxxxx line 21 - xxxxxxxx:cf Xerrorfile2xxxxxxx line 22 - end of testfile --- 0 ---- *** ../vim-7.4.1613/src/testdir/test_quickfix.vim 2016-03-19 13:34:59.385814682 +0100 --- src/testdir/test_quickfix.vim 2016-03-19 22:32:55.591038877 +0100 *************** *** 4,9 **** --- 4,11 ---- finish endif + set encoding=utf-8 + " Tests for the :clist and :llist commands function XlistTests(cchar) let Xlist = a:cchar . 'list' *************** *** 514,516 **** --- 516,639 ---- augroup! testgroup endfunction + + " More tests for 'errorformat' + function! Test_efm1() + if !has('unix') + " The 'errorformat' setting is different on non-Unix systems. + " This test works only on Unix-like systems. + return + endif + + let l = [ + \ '"Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.', + \ '"Xtestfile", line 6 col 19; this is an error', + \ 'gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c', + \ 'Xtestfile:9: parse error before `asd''', + \ 'make: *** [vim] Error 1', + \ 'in file "Xtestfile" linenr 10: there is an error', + \ '', + \ '2 returned', + \ '"Xtestfile", line 11 col 1; this is an error', + \ '"Xtestfile", line 12 col 2; this is another error', + \ '"Xtestfile", line 14:10; this is an error in column 10', + \ '=Xtestfile=, line 15:10; this is another error, but in vcol 10 this time', + \ '"Xtestfile", linenr 16: yet another problem', + \ 'Error in "Xtestfile" at line 17:', + \ 'x should be a dot', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17', + \ ' ^', + \ 'Error in "Xtestfile" at line 18:', + \ 'x should be a dot', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18', + \ '.............^', + \ 'Error in "Xtestfile" at line 19:', + \ 'x should be a dot', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19', + \ '--------------^', + \ 'Error in "Xtestfile" at line 20:', + \ 'x should be a dot', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20', + \ ' ^', + \ '', + \ 'Does anyone know what is the problem and how to correction it?', + \ '"Xtestfile", line 21 col 9: What is the title of the quickfix window?', + \ '"Xtestfile", line 22 col 9: What is the title of the quickfix window?' + \ ] + + call writefile(l, 'Xerrorfile1') + call writefile(l[:-2], 'Xerrorfile2') + + let m = [ + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 4', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 6', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 9', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 10', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 12', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 14', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 15', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 21', + \ ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 22' + \ ] + call writefile(m, 'Xtestfile') + + let save_efm = &efm + set efm+==%f=\\,\ line\ %l%*\\D%v%*[^\ ]\ %m + set efm^=%AError\ in\ \"%f\"\ at\ line\ %l:,%Z%p^,%C%m + + exe 'cf Xerrorfile2' + clast + copen + call assert_equal(':cf Xerrorfile2', w:quickfix_title) + wincmd p + + exe 'cf Xerrorfile1' + call assert_equal([4, 12], [line('.'), col('.')]) + cn + call assert_equal([6, 19], [line('.'), col('.')]) + cn + call assert_equal([9, 2], [line('.'), col('.')]) + cn + call assert_equal([10, 2], [line('.'), col('.')]) + cn + call assert_equal([11, 1], [line('.'), col('.')]) + cn + call assert_equal([12, 2], [line('.'), col('.')]) + cn + call assert_equal([14, 10], [line('.'), col('.')]) + cn + call assert_equal([15, 3, 10], [line('.'), col('.'), virtcol('.')]) + cn + call assert_equal([16, 2], [line('.'), col('.')]) + cn + call assert_equal([17, 6], [line('.'), col('.')]) + cn + call assert_equal([18, 7], [line('.'), col('.')]) + cn + call assert_equal([19, 8], [line('.'), col('.')]) + cn + call assert_equal([20, 9], [line('.'), col('.')]) + clast + cprev + cprev + wincmd w + call assert_equal(':cf Xerrorfile1', w:quickfix_title) + wincmd p + + let &efm = save_efm + call delete('Xerrorfile1') + call delete('Xerrorfile2') + call delete('Xtestfile') + endfunction *** ../vim-7.4.1613/src/testdir/test10a.in 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test10a.in 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,73 **** - Test for 'errorformat'. - - STARTTEST - :so small.vim - :/start of errorfile/,/end of errorfile/w! Xerrorfile - :/start of testfile/,/end of testfile/w! Xtestfile - :cf Xerrorfile - rA - :cn - rB - :cn - rC - :cn - rD - :cn - rE - :w! test.out " Write contents of this file - :qa! - ENDTEST - - start of errorfile - - printf(" %d \n", (number/other)%10 ); - ..................^ - %CC-E-NOSEMI, Missing ";". - at line number 4 in file SYS$DISK:XTESTFILE - - other=10000000; - .............^ - %CC-E-UNDECLARED, In this statement, "oszt" is not declared. - at line number 7 in file SYS$DISK:XTESTFILE - - for (i = 0; i<7 ; i++ ){ - ..................^ - %CC-E-UNDECLARED, In this statement, "i" is not declared. - at line number 16 in file SYS$DISK:XTESTFILE - - some other error somewhere here. - ...........................^ - %CC-W-WARRING, Sorry, but no expalnation for such an warring. - at line number 19 in file SYS$DISK:XTESTFILE - - and finally some other error exactly here. - .....................................^ - %CC-I-INFORMATIONAL, It should be some informational message. - at line number 20 in file SYS$DISK:XTESTFILE - - Does anyone know what is the problem and how to correct ?? :) - end of errorfile - - start of testfile - 01234567890123456789012345678901234567 - line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 4 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 5 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 7 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 8 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 9 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 16 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - end of testfile --- 0 ---- *** ../vim-7.4.1613/src/testdir/test10a.ok 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test10a.ok 1970-01-01 01:00:00.000000000 +0100 *************** *** 1,23 **** - start of testfile - 01234567890123456789012345678901234567 - line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 4 xxxxxxxxxxAxxxxxxxxxxxxxxxxxxx - line 5 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 7 xxxxxBxxxxxxxxxxxxxxxxxxxxxxxx - line 8 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 9 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 16 xxxxxxxxxxCxxxxxxxxxxxxxxxxxxx - line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 19 xxxxxxxxxxxxxxxxxxxDxxxxxxxxxx - line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxE - line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - end of testfile --- 0 ---- *** ../vim-7.4.1613/src/version.c 2016-03-19 22:50:38.419595003 +0100 --- src/version.c 2016-03-19 22:52:52.558138704 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1614, /**/ -- From "know your smileys": |-P Reaction to unusually ugly C code /// 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 ///