| Revisão | 4dd75cfd946f31e81eaa4b03ec81ef141c562137 (tree) |
|---|---|
| Hora | 2007-08-15 00:29:16 |
| Autor | vimboss |
| Commiter | vimboss |
updated for version 7.1-071
src/testdir/Makefile (diff)
src/version.c (diff) src/testdir/test64.in (diff) src/testdir/test64.ok (diff)| @@ -4,6 +4,10 @@ | ||
| 4 | 4 | |
| 5 | 5 | VIMPROG = ../vim |
| 6 | 6 | |
| 7 | +# Uncomment this line for using valgrind. | |
| 8 | +# The output goes into a file "valgrind.$PID" (sorry, no test number). | |
| 9 | +# VALGRIND = valgrind --tool=memcheck --num-callers=15 --logfile=valgrind | |
| 10 | + | |
| 7 | 11 | SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \ |
| 8 | 12 | test7.out test8.out test9.out test10.out test11.out \ |
| 9 | 13 | test12.out test13.out test14.out test15.out test17.out \ |
| @@ -15,7 +19,8 @@ | ||
| 15 | 19 | test43.out test44.out test45.out test46.out test47.out \ |
| 16 | 20 | test48.out test49.out test51.out test52.out test53.out \ |
| 17 | 21 | test54.out test55.out test56.out test57.out test58.out \ |
| 18 | - test59.out test60.out test61.out test62.out test63.out | |
| 22 | + test59.out test60.out test61.out test62.out test63.out \ | |
| 23 | + test64.out | |
| 19 | 24 | |
| 20 | 25 | SCRIPTS_GUI = test16.out |
| 21 | 26 |
| @@ -38,7 +43,7 @@ | ||
| 38 | 43 | |
| 39 | 44 | test1.out: test1.in |
| 40 | 45 | -rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo |
| 41 | - $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 46 | + $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 42 | 47 | @/bin/sh -c "if diff test.out $*.ok; \ |
| 43 | 48 | then mv -f test.out $*.out; \ |
| 44 | 49 | else echo; \ |
| @@ -51,7 +56,7 @@ | ||
| 51 | 56 | cp $*.ok test.ok |
| 52 | 57 | # Sleep a moment to avoid that the xterm title is messed up |
| 53 | 58 | @-sleep .2 |
| 54 | - -$(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 59 | + -$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 55 | 60 | @/bin/sh -c "if test -f test.out; then\ |
| 56 | 61 | if diff test.out $*.ok; \ |
| 57 | 62 | then mv -f test.out $*.out; \ |
| @@ -0,0 +1,52 @@ | ||
| 1 | +Test for regexp patterns. | |
| 2 | + | |
| 3 | +A pattern that gives the expected result produces OK, so that we know it was | |
| 4 | +actually tried. | |
| 5 | + | |
| 6 | +STARTTEST | |
| 7 | +:so small.vim | |
| 8 | +:" tl is a List of Lists with: | |
| 9 | +:" regexp pattern | |
| 10 | +:" text to test the pattern on | |
| 11 | +:" expected match (optional) | |
| 12 | +:" expected submatch 1 (optional) | |
| 13 | +:" expected submatch 2 (optional) | |
| 14 | +:" etc. | |
| 15 | +:" When there is no match use only the first two items. | |
| 16 | +:let tl = [] | |
| 17 | +:call add(tl, ['b', 'abcdef', 'b']) | |
| 18 | +:call add(tl, ['bc*', 'abccccdef', 'bcccc']) | |
| 19 | +:call add(tl, ['bc\{-}', 'abccccdef', 'b']) | |
| 20 | +:call add(tl, ['bc\{-}\(d\)', 'abccccdef', 'bccccd', 'd']) | |
| 21 | +:call add(tl, ['x', 'abcdef']) | |
| 22 | +:" | |
| 23 | +:for t in tl | |
| 24 | +: let l = matchlist(t[1], t[0]) | |
| 25 | +:" check the match itself | |
| 26 | +: if len(l) == 0 && len(t) > 2 | |
| 27 | +: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", did not match, expected: \"' . t[2] . '\"' | |
| 28 | +: elseif len(l) > 0 && len(t) == 2 | |
| 29 | +: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", match: \"' . l[0] . '\", expected no match' | |
| 30 | +: elseif len(t) > 2 && l[0] != t[2] | |
| 31 | +: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", match: \"' . l[0] . '\", expected: \"' . t[2] . '\"' | |
| 32 | +: else | |
| 33 | +: $put ='OK' | |
| 34 | +: endif | |
| 35 | +: if len(l) > 0 | |
| 36 | +:" check all the nine submatches | |
| 37 | +: for i in range(1, 9) | |
| 38 | +: if len(t) <= i + 2 | |
| 39 | +: let e = '' | |
| 40 | +: else | |
| 41 | +: let e = t[i + 2] | |
| 42 | +: endif | |
| 43 | +: if l[i] != e | |
| 44 | +: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"' | |
| 45 | +: endif | |
| 46 | +: endfor | |
| 47 | +: endif | |
| 48 | +:endfor | |
| 49 | +:/^Results/,$wq! test.out | |
| 50 | +ENDTEST | |
| 51 | + | |
| 52 | +Results of test64: |
| @@ -0,0 +1,6 @@ | ||
| 1 | +Results of test64: | |
| 2 | +OK | |
| 3 | +OK | |
| 4 | +OK | |
| 5 | +OK | |
| 6 | +OK |
| @@ -667,6 +667,8 @@ | ||
| 667 | 667 | static int included_patches[] = |
| 668 | 668 | { /* Add new patch number below this line */ |
| 669 | 669 | /**/ |
| 670 | + 71, | |
| 671 | +/**/ | |
| 670 | 672 | 70, |
| 671 | 673 | /**/ |
| 672 | 674 | 69, |
Vim
Fork