diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-11-17 17:56:13 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-11-17 17:56:13 +0100 |
| commit | cc28e2d05d05552d8b72a520be8a193f3d9822d4 (patch) | |
| tree | 10636aea7b16c817cb42d82d306dafc79e636ce1 | |
| parent | 7df915d113ac1981792c50e8b000c9f5f784b78b (diff) | |
patch 8.0.0088v8.0.0088
Problem: When a test fails in Setup or Teardown the problem is not reported.
Solution: Add a try/catch. (Hirohito Higashi)
| -rw-r--r-- | src/testdir/runtest.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index c4cb847324..3ba3b02648 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -89,7 +89,11 @@ endfunc function RunTheTest(test) echo 'Executing ' . a:test if exists("*SetUp") - call SetUp() + try + call SetUp() + catch + call add(v:errors, 'Caught exception in SetUp() before ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint) + endtry endif call add(s:messages, 'Executing ' . a:test) @@ -104,7 +108,11 @@ function RunTheTest(test) endtry if exists("*TearDown") - call TearDown() + try + call TearDown() + catch + call add(v:errors, 'Caught exception in TearDown() after ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint) + endtry endif " Close any extra windows and make the current one not modified. @@ -221,3 +229,5 @@ call append(line('$'), s:messages) write qall! + +" vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 074c7ebc76..ada385c822 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 88, +/**/ 87, /**/ 86, |