commit 81df63537e281da38b45bc1806e2b4582e804242
author Bram Moolenaar <Bram@vim.org> Sat Dec 22 18:25:30 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Dec 22 18:25:30 2018 +0100
tree 397591c9bb369c3bbb03df51d059f2d4239f5671
parent 39b5d8b514a0022899a09ba097997099d861dcff

patch 8.1.0625: MS-Windows: terminal test fails in white console

Problem:    MS-Windows: terminal test fails in white console.
Solution:   Accept both white and black background colors.

src/testdir/test_terminal.vim

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 220b1d1..f31c221 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -159,10 +159,16 @@
   call assert_equal('2', l[1].chars)
   call assert_equal('3', l[2].chars)
   call assert_equal('#00e000', l[0].fg)
-  if &background == 'light'
-    call assert_equal('#ffffff', l[0].bg)
+  if has('win32')
+    " On Windows 'background' always defaults to dark, even though the terminal
+    " may use a light background.  Therefore accept both white and black.
+    call assert_match('#ffffff\|#000000', l[0].bg)
   else
-    call assert_equal('#000000', l[0].bg)
+    if &background == 'light'
+      call assert_equal('#ffffff', l[0].bg)
+    else
+      call assert_equal('#000000', l[0].bg)
+    endif
   endif
 
   let l = term_getline(a:buf, -1)

src/version.c

diff --git a/src/version.c b/src/version.c
index 3321974..594be52 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    625,
+/**/
     624,
 /**/
     623,