# HG changeset patch # User Christian Brabandt # Date 1712340906 -7200 # Node ID 1104d85c7dcc8ad8a4ed8c7d5956196e132b7b77 # Parent 7512fa13de089c9f0aee5fcd23be8da98a56df22 patch 9.1.0269: Test for TextChanged is still flaky with ASAN Commit: https://github.com/vim/vim/commit/e9ff79a7c9affea970f50de2aa65f62080b55323 Author: zeertzjq Date: Fri Apr 5 20:07:39 2024 +0200 patch 9.1.0269: Test for TextChanged is still flaky with ASAN Problem: Test for TextChanged is still flaky with ASAN. Solution: Don't index the result of readfile(). (zeertzjq) It turns out that with ASAN the file may become empty during a write even if it's non-empty both before and after the write, in which case indexing the result of readfile() will error, so use join() instead. Also don't delete the file halfway the test, just in case it may cause errors on the next read. closes: #14421 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -4495,39 +4495,40 @@ func Test_Changed_ChangedI() \ {'term_rows': 10}) call assert_equal('running', term_getstatus(buf)) call WaitForAssert({-> assert_true(filereadable('XTextChangedI3'))}) + defer delete('XTextChangedI3') call WaitForAssert({-> assert_equal([''], readfile('XTextChangedI3'))}) " TextChanged should trigger if a mapping enters and leaves Insert mode. call term_sendkeys(buf, "\") - call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')->join("\n"))}) call term_sendkeys(buf, "i") call WaitForAssert({-> assert_match('^-- INSERT --', term_getline(buf, 10))}) - call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')->join("\n"))}) " TextChangedI should trigger if change is done in Insert mode. call term_sendkeys(buf, "f") - call WaitForAssert({-> assert_equal('N4,I5', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N4,I5', readfile('XTextChangedI3')->join("\n"))}) call term_sendkeys(buf, "o") - call WaitForAssert({-> assert_equal('N4,I6', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N4,I6', readfile('XTextChangedI3')->join("\n"))}) call term_sendkeys(buf, "o") - call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')->join("\n"))}) " TextChanged shouldn't trigger when leaving Insert mode and TextChangedI " has been triggered. call term_sendkeys(buf, "\") call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))}) - call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')->join("\n"))}) " TextChanged should trigger if change is done in Normal mode. call term_sendkeys(buf, "yyp") - call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')->join("\n"))}) " TextChangedI shouldn't trigger if change isn't done in Insert mode. call term_sendkeys(buf, "i") call WaitForAssert({-> assert_match('^-- INSERT --', term_getline(buf, 10))}) - call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')->join("\n"))}) call term_sendkeys(buf, "\") call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))}) - call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')->join("\n"))}) " TextChangedI should trigger if change is a mix of Normal and Insert modes. func! s:validate_mixed_textchangedi(buf, keys) @@ -4537,13 +4538,13 @@ func Test_Changed_ChangedI() call term_sendkeys(buf, "\") call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))}) call term_sendkeys(buf, ":let [g:autocmd_n, g:autocmd_i] = ['', '']\") - call delete('XTextChangedI3') + call writefile([], 'XTextChangedI3') call term_sendkeys(buf, a:keys) call WaitForAssert({-> assert_match('^-- INSERT --', term_getline(buf, 10))}) - call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')->join("\n"))}) call term_sendkeys(buf, "\") call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))}) - call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')[0])}) + call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')->join("\n"))}) endfunc call s:validate_mixed_textchangedi(buf, "o") @@ -4556,7 +4557,6 @@ func Test_Changed_ChangedI() " clean up bwipe! - call delete('XTextChangedI3') endfunc " Test that filetype detection still works when SwapExists autocommand sets diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 269, +/**/ 268, /**/ 267,