patch 9.1.0833: CI: recent ASAN changes do not work for indent tests

Problem:  CI: recent ASAN changes do not work for indent tests
Solution: Move code to runtime/indent/testdir/runtest.vim
          (Aliaksei Budavei)

closes: #15981

Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index dde8c5c47bfba972993fd9654a6d032a797490bb..9559a810b1a05a303124efdc3fcacc8e59d2246a 100644 (file)
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -14,6 +14,19 @@ set modeline
 set debug=throw
 set nomore
 
+" Remember the directory where we started.
+let indentDir = getcwd()
+cd ../../src/testdir
+
+" Needed for ValgrindOrAsan().
+source shared.vim
+exe 'cd ' .. fnameescape(indentDir)
+
+if ValgrindOrAsan()
+  let g:vim_indent = {"searchpair_timeout": 1024}
+  let g:python_indent = {"searchpair_timeout": 1024}
+endif
+
 au! SwapExists * call HandleSwapExists()
 func HandleSwapExists()
   " Ignore finding a swap file for the test input and output, the user might be

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 9bb500e2657ef24242649c93acd80c8813f65885..ded31975b80ba7a76a0a25bb898d3260cf87384c 100644 (file)
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -247,11 +247,6 @@ func RunTheTest(test)
     let g:timeout_start = localtime()
   endif
 
-  if ValgrindOrAsan()
-    let g:vim_indent = {"searchpair_timeout": 1024}
-    let g:python_indent = {"searchpair_timeout": 1024}
-  endif
-
   " Avoid stopping at the "hit enter" prompt
   set nomore
 

diff --git a/src/version.c b/src/version.c
index e4625857246514c2bc6025c88cd5ea33a9a3f32e..393d2e398afe61bae803fc65dd39bf219329ebeb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    833,
 /**/
     832,
 /**/