To: vim_dev@googlegroups.com
Subject: Patch 8.2.0874
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0874
Problem:    Signals test is a bit flaky.
Solution:   Flush the XautoOut file.  Delete files that may be left behind
            from a failure. (Dominique Pelle, closes #6179)
Files:      src/testdir/test_signals.vim


*** ../vim-8.2.0873/src/testdir/test_signals.vim	2020-05-31 21:27:58.335221898 +0200
--- src/testdir/test_signals.vim	2020-06-01 15:02:59.432827188 +0200
***************
*** 123,131 ****
    if cmd =~ 'valgrind'
      throw 'Skipped: cannot test signal TERM with valgrind'
    endif
    let lines =<< trim END
!     au VimLeave * call writefile(["VimLeave triggered"], "XautoOut", "a")
!     au VimLeavePre * call writefile(["VimLeavePre triggered"], "XautoOut", "a")
    END
    call writefile(lines, 'XsetupAucmd')
  
--- 123,137 ----
    if cmd =~ 'valgrind'
      throw 'Skipped: cannot test signal TERM with valgrind'
    endif
+ 
+   " If test fails once, it can leave temporary files and trying to rerun
+   " the test would then fail again if they are not deleted first.
+   call delete('.Xsig_TERM.swp')
+   call delete('XsetupAucmd')
+   call delete('XautoOut')
    let lines =<< trim END
!     au VimLeave * call writefile(["VimLeave triggered"], "XautoOut", "as")
!     au VimLeavePre * call writefile(["VimLeavePre triggered"], "XautoOut", "as")
    END
    call writefile(lines, 'XsetupAucmd')
  
*** ../vim-8.2.0873/src/version.c	2020-06-01 14:43:55.993243914 +0200
--- src/version.c	2020-06-01 15:04:55.540377605 +0200
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     874,
  /**/

-- 
"Women marry men hoping they will change. Men marry women hoping
they will not. So each is inevitably disappointed."
 - Einstein

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///