To: vim_dev@googlegroups.com
Subject: Patch 8.1.2056
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.1.2056
Problem:    "make test" for indent files doesn't cause make to fail.
Solution:   Exit the script with ":cquit". (Daniel Hahler, closes #4949)
Files:	    runtime/indent/testdir/runtest.vim, .gitignore


*** ../vim-8.1.2055/runtime/indent/testdir/runtest.vim	2018-12-15 17:43:38.870899928 +0100
--- runtime/indent/testdir/runtest.vim	2019-09-18 22:10:33.736967167 +0200
***************
*** 7,13 ****
--- 7,15 ----
  
  set nocp
  filetype indent on
+ syn on
  set nowrapscan
+ set report=9999
  
  au! SwapExists * call HandleSwapExists()
  func HandleSwapExists()
***************
*** 18,23 ****
--- 20,26 ----
    endif
  endfunc
  
+ let failed_count = 0
  for fname in glob('testdir/*.in', 1, 1)
    let root = substitute(fname, '\.in', '', '')
  
***************
*** 108,116 ****
      endif
  
      if failed
        exe 'write ' . root . '.fail'
        echoerr 'Test ' . fname . ' FAILED!'
-       sleep 2
      else
        exe 'write ' . root . '.out'
      endif
--- 111,119 ----
      endif
  
      if failed
+       let failed_count += 1
        exe 'write ' . root . '.fail'
        echoerr 'Test ' . fname . ' FAILED!'
      else
        exe 'write ' . root . '.out'
      endif
***************
*** 122,125 ****
--- 125,132 ----
  " Matching "if 1" at the start.
  endif
  
+ if failed_count > 0
+   " have make report an error
+   cquit
+ endif
  qall!
*** ../vim-8.1.2055/.gitignore	2019-06-21 17:36:03.914009953 +0200
--- .gitignore	2019-09-18 22:11:08.752700067 +0200
***************
*** 77,82 ****
--- 77,83 ----
  src/testdir/viminfo
  src/testdir/opt_test.vim
  runtime/indent/testdir/*.out
+ runtime/indent/testdir/*.fail
  src/memfile_test
  src/json_test
  src/message_test
*** ../vim-8.1.2055/src/version.c	2019-09-18 22:04:52.746906319 +0200
--- src/version.c	2019-09-18 22:12:29.428118177 +0200
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     2056,
  /**/

-- 
If I tell you "you have a beautiful body", would you hold it against me?

 /// 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    ///