1
0
forked from aniani/vim

updated for version 7.1-071

This commit is contained in:
Bram Moolenaar
2007-08-14 15:29:16 +00:00
parent 2b80e65818
commit 4d2fffc833
4 changed files with 68 additions and 3 deletions

View File

@@ -4,6 +4,10 @@
VIMPROG = ../vim VIMPROG = ../vim
# Uncomment this line for using valgrind.
# The output goes into a file "valgrind.$PID" (sorry, no test number).
# VALGRIND = valgrind --tool=memcheck --num-callers=15 --logfile=valgrind
SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
test7.out test8.out test9.out test10.out test11.out \ test7.out test8.out test9.out test10.out test11.out \
test12.out test13.out test14.out test15.out test17.out \ test12.out test13.out test14.out test15.out test17.out \
@@ -15,7 +19,8 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
test43.out test44.out test45.out test46.out test47.out \ test43.out test44.out test45.out test46.out test47.out \
test48.out test49.out test51.out test52.out test53.out \ test48.out test49.out test51.out test52.out test53.out \
test54.out test55.out test56.out test57.out test58.out \ test54.out test55.out test56.out test57.out test58.out \
test59.out test60.out test61.out test62.out test63.out test59.out test60.out test61.out test62.out test63.out \
test64.out
SCRIPTS_GUI = test16.out SCRIPTS_GUI = test16.out
@@ -38,7 +43,7 @@ clean:
test1.out: test1.in test1.out: test1.in
-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo -rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
$(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
@/bin/sh -c "if diff test.out $*.ok; \ @/bin/sh -c "if diff test.out $*.ok; \
then mv -f test.out $*.out; \ then mv -f test.out $*.out; \
else echo; \ else echo; \
@@ -51,7 +56,7 @@ test1.out: test1.in
cp $*.ok test.ok cp $*.ok test.ok
# Sleep a moment to avoid that the xterm title is messed up # Sleep a moment to avoid that the xterm title is messed up
@-sleep .2 @-sleep .2
-$(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in -$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
@/bin/sh -c "if test -f test.out; then\ @/bin/sh -c "if test -f test.out; then\
if diff test.out $*.ok; \ if diff test.out $*.ok; \
then mv -f test.out $*.out; \ then mv -f test.out $*.out; \

52
src/testdir/test64.in Normal file
View File

@@ -0,0 +1,52 @@
Test for regexp patterns.
A pattern that gives the expected result produces OK, so that we know it was
actually tried.
STARTTEST
:so small.vim
:" tl is a List of Lists with:
:" regexp pattern
:" text to test the pattern on
:" expected match (optional)
:" expected submatch 1 (optional)
:" expected submatch 2 (optional)
:" etc.
:" When there is no match use only the first two items.
:let tl = []
:call add(tl, ['b', 'abcdef', 'b'])
:call add(tl, ['bc*', 'abccccdef', 'bcccc'])
:call add(tl, ['bc\{-}', 'abccccdef', 'b'])
:call add(tl, ['bc\{-}\(d\)', 'abccccdef', 'bccccd', 'd'])
:call add(tl, ['x', 'abcdef'])
:"
:for t in tl
: let l = matchlist(t[1], t[0])
:" check the match itself
: if len(l) == 0 && len(t) > 2
: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", did not match, expected: \"' . t[2] . '\"'
: elseif len(l) > 0 && len(t) == 2
: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", match: \"' . l[0] . '\", expected no match'
: elseif len(t) > 2 && l[0] != t[2]
: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", match: \"' . l[0] . '\", expected: \"' . t[2] . '\"'
: else
: $put ='OK'
: endif
: if len(l) > 0
:" check all the nine submatches
: for i in range(1, 9)
: if len(t) <= i + 2
: let e = ''
: else
: let e = t[i + 2]
: endif
: if l[i] != e
: $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
: endif
: endfor
: endif
:endfor
:/^Results/,$wq! test.out
ENDTEST
Results of test64:

6
src/testdir/test64.ok Normal file
View File

@@ -0,0 +1,6 @@
Results of test64:
OK
OK
OK
OK
OK

View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
71,
/**/ /**/
70, 70,
/**/ /**/