patch 9.1.0833: CI: recent ASAN changes do not work for indent tests
Commit:
https://github.com/vim/vim/commit/9fd5d9674f1e5392be9dff0ec338e25c05196fe9
Author: Aliaksei Budavei <[email protected]>
Date: Sun Nov 3 09:15:35 2024 +0100
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/indent/testdir/runtest.vim
b/runtime/indent/testdir/runtest.vim
index dde8c5c47..9559a810b 100644
--- 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 9bb500e26..ded31975b 100644
--- 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 e46258572..393d2e398 100644
--- 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1t7Vzn-00ARWs-Rr%40256bit.org.
