diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-02-20 16:54:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-02-20 16:54:27 +0100 |
| commit | 995a8cd18190c0b922796a8ee865e95bd1dbd916 (patch) | |
| tree | 67c37aa4776ac53026a2d227701fa82e6e468ac8 | |
| parent | 445f3037ea1640683433df89ba383f2e4c79329a (diff) | |
updated for version 7.3.827v7.3.827
Problem: Python tests fail.
Solution: Adjust the output for the stack trace.
| -rw-r--r-- | src/testdir/test86.in | 6 | ||||
| -rw-r--r-- | src/testdir/test86.ok | 2 | ||||
| -rw-r--r-- | src/testdir/test87.ok | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/testdir/test86.in b/src/testdir/test86.in index 71635bda2f..5282269a3a 100644 --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -1,5 +1,11 @@ Tests for various python features. vim: set ft=vim : +NOTE: This will cause errors when run under valgrind. +This would require recompiling Python with: + ./configure --without-pymalloc +See http://svn.python.org/view/python/trunk/Misc/README.valgrind?view=markup + + STARTTEST :so small.vim :if !has('python') | e! test.ok | wq! test.out | endif diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok index 3dd8d79944..8960390f59 100644 --- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -61,7 +61,7 @@ ll:[1] 0.0 "\0": Vim(let):E859: {"\0": 1}: Vim(let):E859: -undefined_name: Vim(let):E858: +undefined_name: Vim(let):Trace vim: Vim(let):E859: [1] [1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1] diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok index 3dffa26d47..b8769002ab 100644 --- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -61,7 +61,7 @@ ll:[1] 0.0 "\0": Vim(let):E861: {"\0": 1}: Vim(let):E861: -undefined_name: Vim(let):E860: +undefined_name: Vim(let):Trace vim: Vim(let):E861: [1] [1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1] diff --git a/src/version.c b/src/version.c index d637b9fea3..204b7a173e 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 827, +/**/ 826, /**/ 825, |