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 dde8c5c..9559a81 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -14,6 +14,19 @@
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 9bb500e..ded3197 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -247,11 +247,6 @@
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 e462585..393d2e3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 833,
+/**/
832,
/**/
831,