diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-12-06 14:21:09 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-12-06 14:21:09 +0000 |
| commit | 6572a90287c7aa6e8042b18604891e9df3657245 (patch) | |
| tree | 14b41a4662aacb8afb4853844c3c1f3e49918be5 | |
| parent | 56a40fea9c28f8fc918a0db6de4c048da241cf32 (diff) | |
| download | vim-git-6572a90287c7aa6e8042b18604891e9df3657245.tar.gz | |
patch 9.0.1020: tests call GetSwapFileList() before it is definedv9.0.1020
Problem: Tests call GetSwapFileList() before it is defined.
Solution: Move the call to after defining the function. (Christopher
Plewright)
| -rw-r--r-- | src/testdir/runtest.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 93acf9958..ccd22e89f 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -161,13 +161,6 @@ if has('mac') endif -" A previous (failed) test run may have left swap files behind. Delete them -" before running tests again, they might interfere. -for name in s:GetSwapFileList() - call delete(name) -endfor - - " Prepare for calling test_garbagecollect_now(). let v:testing = 1 @@ -210,6 +203,13 @@ func s:GetSwapFileList() return files endfunc +" A previous (failed) test run may have left swap files behind. Delete them +" before running tests again, they might interfere. +for name in s:GetSwapFileList() + call delete(name) +endfor + + " Invoked when a test takes too much time. func TestTimeout(id) split test.log diff --git a/src/version.c b/src/version.c index e49b0bc79..288164a4e 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1020, +/**/ 1019, /**/ 1018, |