From cf801d4b95180ddaee1bf633ef482232625dd80b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 21 Jun 2022 18:34:42 +0100
Subject: [PATCH] patch 8.2.5145: exit test causes spurious valgrind reports

Problem:    Exit test causes spurious valgrind reports.
Solution:   Skip test.  Add CheckNotValgrind.
---
 src/testdir/check.vim        | 8 ++++++++
 src/testdir/test_channel.vim | 4 +---
 src/testdir/test_exit.vim    | 1 +
 src/version.c                | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/testdir/check.vim b/src/testdir/check.vim
index aff0918454a74..d64e8457b10ad 100644
--- a/src/testdir/check.vim
+++ b/src/testdir/check.vim
@@ -217,6 +217,14 @@ func CheckNotAsan()
   endif
 endfunc
 
+" Command to check for not running under valgrind
+command CheckNotValgrind call CheckNotValgrind()
+func CheckNotValgrind()
+  if RunningWithValgrind()
+    throw 'Skipped: does not work well with valgrind'
+  endif
+endfunc
+
 " Command to check for X11 based GUI
 command CheckX11BasedGui call CheckX11BasedGui()
 func CheckX11BasedGui()
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index a7a609bd0e3fe..d299ee3e62991 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1793,9 +1793,7 @@ endfunc
 
 func Test_job_stop_immediately()
   " With valgrind this causes spurious leak reports
-  if RunningWithValgrind()
-    return
-  endif
+  CheckNotValgrind
 
   let g:job = job_start([s:python, '-c', 'import time;time.sleep(10)'])
   try
diff --git a/src/testdir/test_exit.vim b/src/testdir/test_exit.vim
index c05374cb86654..a7596e1019043 100644
--- a/src/testdir/test_exit.vim
+++ b/src/testdir/test_exit.vim
@@ -115,6 +115,7 @@ func Test_exit_error_reading_input()
   CheckNotMSWindows
   " The early exit causes memory not to be freed somehow
   CheckNotAsan
+  CheckNotValgrind
 
   call writefile([":au VimLeave * call writefile(['l = ' .. v:exiting], 'Xtestout')", ":tabnew", "q:"], 'Xscript', 'b')
 
diff --git a/src/version.c b/src/version.c
index 9b2fd4e7a34c1..0353e90cff447 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5145,
 /**/
     5144,
 /**/