diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-13 20:15:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-13 20:15:37 +0200 |
| commit | caca646bf0f5e55fe32604e90b87b02034e2812b (patch) | |
| tree | a11fb39a9b68c45f4821f73d311473460bb97b67 | |
| parent | 8df5acfda9e5a41e643066e044f4adb47bfb83ba (diff) | |
| download | vim-git-caca646bf0f5e55fe32604e90b87b02034e2812b.tar.gz | |
updated for version 7.4.294v7.4.294
Problem: Test files missing from patch.
Solution: Patch the test files.
| -rw-r--r-- | src/testdir/test95.in | 14 | ||||
| -rw-r--r-- | src/testdir/test95.ok | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 5 deletions
diff --git a/src/testdir/test95.in b/src/testdir/test95.in index 817e1f12e..9fac4d27d 100644 --- a/src/testdir/test95.in +++ b/src/testdir/test95.in @@ -51,7 +51,11 @@ STARTTEST :call add(tl, [1, "\u05b9\u05bb", " y\u05b9 x\u05b9\u05bb ", "x\u05b9\u05bb"]) :call add(tl, [2, ".\u05b9\u05bb", " y\u05bb x\u05b9\u05bb ", "x\u05b9\u05bb"]) :call add(tl, [2, "a", "ca\u0300t"]) +:call add(tl, [2, "ca", "ca\u0300t"]) :call add(tl, [2, "a\u0300", "ca\u0300t", "a\u0300"]) +:call add(tl, [2, 'a\%C', "ca\u0300t", "a\u0300"]) +:call add(tl, [2, 'ca\%C', "ca\u0300t", "ca\u0300"]) +:call add(tl, [2, 'ca\%Ct', "ca\u0300t", "ca\u0300t"]) :"""" Test \Z @@ -91,15 +95,15 @@ STARTTEST : try : let l = matchlist(text, pat) : catch -: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", caused an exception: \"' . v:exception . '\"' +: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", caused an exception: \"' . v:exception . '\"' : endtry :" check the match itself : if len(l) == 0 && len(t) > matchidx -: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", did not match, expected: \"' . t[matchidx] . '\"' +: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", did not match, expected: \"' . t[matchidx] . '\"' : elseif len(l) > 0 && len(t) == matchidx -: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected no match' +: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected no match' : elseif len(t) > matchidx && l[0] != t[matchidx] -: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected: \"' . t[matchidx] . '\"' +: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", match: \"' . l[0] . '\", expected: \"' . t[matchidx] . '\"' : else : $put ='OK ' . engine . ' - ' . pat : endif @@ -112,7 +116,7 @@ STARTTEST : let e = t[matchidx + i] : endif : if l[i] != e -: $put ='ERROR: pat: \"' . pat . '\", text: \"' . text . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"' +: $put ='ERROR ' . engine . ': pat: \"' . pat . '\", text: \"' . text . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"' : endif : endfor : unlet i diff --git a/src/testdir/test95.ok b/src/testdir/test95.ok index e2baee8d2..6762994c1 100644 --- a/src/testdir/test95.ok +++ b/src/testdir/test95.ok @@ -70,9 +70,21 @@ OK 2 - .ֹֻ OK 0 - a OK 1 - a OK 2 - a +OK 0 - ca +OK 1 - ca +OK 2 - ca OK 0 - à OK 1 - à OK 2 - à +OK 0 - a\%C +OK 1 - a\%C +OK 2 - a\%C +OK 0 - ca\%C +OK 1 - ca\%C +OK 2 - ca\%C +OK 0 - ca\%Ct +OK 1 - ca\%Ct +OK 2 - ca\%Ct OK 0 - ú\Z OK 1 - ú\Z OK 2 - ú\Z diff --git a/src/version.c b/src/version.c index ed7289111..94e4e2d46 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 294, +/**/ 293, /**/ 292, |