Mercurial > vim
changeset 4478:032c9f916f25 v7.3.987
updated for version 7.3.987
Problem: No easy to run an individual test. Tests 64 fails when
'encoding' is not utf-8.
Solution: Add individual test targets to the Makefile. Move some lines from
test 64 to 95.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 21 May 2013 13:30:21 +0200 |
| parents | 3dc6e509eb1f |
| children | a720548104ea |
| files | src/Makefile src/testdir/test64.in src/testdir/test64.ok src/testdir/test95.in src/testdir/test95.ok src/version.c |
| diffstat | 6 files changed, 41 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -1861,6 +1861,19 @@ unittest unittests: $(UNITTEST_TARGETS) ./$$t || exit 1; echo $$t passed; \ done +# Run individual test, assuming that Vim was already compiled. +test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 \ + test11 test12 test13 test14 test15 test16 test17 test18 test19 \ + test21 test22 test23 test24 test25 test26 test27 test28 test29 \ + test31 test32 test33 test34 test35 test36 test37 test38 test39 \ + test41 test42 test43 test44 test45 test46 test47 test48 test49 \ + test51 test52 test53 test54 test55 test56 test57 test58 test59 \ + test61 test62 test63 test64 test65 test66 test67 test68 test69 \ + test71 test72 test73 test74 test75 test76 test77 test78 test79 \ + test81 test82 test83 test84 test85 test86 test87 test88 test89 \ + test91 test92 test93 test94 test95 test96 test97 test98 test99: + cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) + testclean: cd testdir; $(MAKE) -f Makefile clean if test -d $(PODIR); then \
--- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -262,10 +262,6 @@ STARTTEST :call add(tl, ['[a-zA-Z]', 'a', 'a']) :call add(tl, ['[A-Z]', 'a']) :call add(tl, ['\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa']) -:call add(tl, ['\i\+', '&*§xx ', 'xx']) -:call add(tl, ['\%#=1\i\+', '&*§xx ', 'xx']) -:call add(tl, ['\f\+', '&*fname ', 'fname']) -:call add(tl, ['\%#=1\i\+', '&*fname ', 'fname']) :"""" Tests for \z features :call add(tl, ['xx \ze test', 'xx ']) " must match after \ze @@ -290,13 +286,18 @@ STARTTEST :"""" Combining different tests and features :call add(tl, ['[[:alpha:]]\{-2,6}', '787abcdiuhsasiuhb4', 'ab']) -:call add(tl, ['[^[=a=]]\+', 'ddaãâbcd', 'dd']) :call add(tl, ['', 'abcd', '']) :call add(tl, ['\v(())', 'any possible text', '']) :call add(tl, ['\v%(ab(xyz)c)', ' abxyzc ', 'abxyzc', 'xyz']) :call add(tl, ['\v(test|)empty', 'tesempty', 'empty', '']) :call add(tl, ['\v(a|aa)(a|aa)', 'aaa', 'aa', 'a', 'a']) +:"""" \%u and friends +:call add(tl, ['\%d32', 'yes no', ' ']) +:call add(tl, ['\%o40', 'yes no', ' ']) +:call add(tl, ['\%x20', 'yes no', ' ']) +:call add(tl, ['\%u0020', 'yes no', ' ']) +:call add(tl, ['\%U00000020', 'yes no', ' ']) :"""" Run the tests
--- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -203,10 +203,6 @@ OK - [a-z] OK - [a-zA-Z] OK - [A-Z] OK - \C[^A-Z]\+ -OK - \i\+ -OK - \%#=1\i\+ -OK - \f\+ -OK - \%#=1\i\+ OK - xx \ze test OK - abc\zeend OK - abc\zsdd @@ -225,10 +221,14 @@ OK - .*John\&.*Bob OK - .*John\&.*Bob OK - \v(test1)@=.*yep OK - [[:alpha:]]\{-2,6} -OK - [^[=a=]]\+ OK - OK - \v(()) OK - \v%(ab(xyz)c) OK - \v(test|)empty OK - \v(a|aa)(a|aa) +OK - \%d32 +OK - \%o40 +OK - \%x20 +OK - \%u0020 +OK - \%U00000020 192.168.0.1
--- a/src/testdir/test95.in +++ b/src/testdir/test95.in @@ -7,7 +7,7 @@ actually tried. STARTTEST :so small.vim :so mbyte.vim -:set encoding=utf-8 viminfo+=nviminfo +:set nocp encoding=utf-8 viminfo+=nviminfo :" tl is a List of Lists with: :" regexp pattern :" text to test the pattern on @@ -29,6 +29,15 @@ STARTTEST :" this is not a normal "i" but 0xec :call add(tl, ['\p\+', 'ìa', 'ìa']) +:"""" Test recognition of some character classes +:call add(tl, ['\i\+', '&*§xx ', 'xx']) +:call add(tl, ['\%#=1\i\+', '&*§xx ', 'xx']) +:call add(tl, ['\f\+', '&*fname ', 'fname']) +:call add(tl, ['\%#=1\i\+', '&*fname ', 'fname']) + +:"""" Combining different tests and features +:call add(tl, ['[^[=a=]]\+', 'ddaãâbcd', 'dd']) + :"""" Run the tests :"