summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-05-09 21:45:47 +0100
committerBram Moolenaar <Bram@vim.org>2023-05-09 21:45:47 +0100
commit916d6dd5b1834293e21a72ef70175aae57e78fba (patch)
treeb49fee5748454e5d657de617f8bedc95b3a0be42
parent6f37e530d3e2d58ff055723047bf91d91af2632c (diff)
downloadvim-git-916d6dd5b1834293e21a72ef70175aae57e78fba.tar.gz
patch 9.0.1534: test for expanding "~" in substitute takes too longv9.0.1534
Problem: Test for expanding "~" in substitute takes too long. Solution: Disable the test for now.
-rw-r--r--src/testdir/test_substitute.vim25
-rw-r--r--src/version.c2
2 files changed, 15 insertions, 12 deletions
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index 32e2f2785..73e6bef58 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -1415,18 +1415,19 @@ func Test_substitute_short_cmd()
endfunc
" Check handling expanding "~" resulting in extremely long text.
-func Test_substitute_tilde_too_long()
- enew!
-
- s/.*/ixxx
- s//~~~~~~~~~AAAAAAA@(
-
- " Either fails with "out of memory" or "text too long".
- " This can take a long time.
- call assert_fails('sil! norm &&&&&&&&&', ['E1240:\|E342:'])
-
- bwipe!
-endfunc
+" FIXME: disabled, it takes too long to run on CI
+#func Test_substitute_tilde_too_long()
+# enew!
+#
+# s/.*/ixxx
+# s//~~~~~~~~~AAAAAAA@(
+#
+# " Either fails with "out of memory" or "text too long".
+# " This can take a long time.
+# call assert_fails('sil! norm &&&&&&&&&', ['E1240:\|E342:'])
+#
+# bwipe!
+#endfunc
" This should be done last to reveal a memory leak when vim_regsub_both() is
" called to evaluate an expression but it is not used in a second call.
diff --git a/src/version.c b/src/version.c
index 97530bfa8..166509644 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1534,
+/**/
1533,
/**/
1532,