From 6572a90287c7aa6e8042b18604891e9df3657245 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 6 Dec 2022 14:21:09 +0000 Subject: [PATCH] patch 9.0.1020: tests call GetSwapFileList() before it is defined Problem: Tests call GetSwapFileList() before it is defined. Solution: Move the call to after defining the function. (Christopher Plewright) --- src/testdir/runtest.vim | 14 +++++++------- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 93acf99587..ccd22e89fa 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 e49b0bc792..288164a4ee 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1020, /**/ 1019, /**/