summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-03-20 22:16:56 +0100
committerBram Moolenaar <Bram@vim.org>2021-03-20 22:16:56 +0100
commitc5cf369e9543ff065e2e1da91da3218c223840e2 (patch)
treef220b0742f066099882f82e83758ddaba361243d
parenta0c8aea479ca055ce43ba2984a9933f6c48e6161 (diff)
downloadvim-git-c5cf369e9543ff065e2e1da91da3218c223840e2.tar.gz
patch 8.2.2632: not all command line arguments are testedv8.2.2632
Problem: Not all command line arguments are tested. Solution: Add tests for -D and -serverlist. (Dominique Pellé, closes #7992)
-rw-r--r--src/testdir/test_clientserver.vim8
-rw-r--r--src/testdir/test_startup.vim15
-rw-r--r--src/version.c2
3 files changed, 25 insertions, 0 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 6a73d93e5..2704fb668 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -43,6 +43,14 @@ func Test_client_server()
" When using valgrind it takes much longer.
call WaitForAssert({-> assert_match(name, serverlist())})
+ if !has('win32')
+ if RunVim([], [], '--serverlist >Xtest_serverlist')
+ let lines = readfile('Xtest_serverlist')
+ call assert_true(index(lines, 'XVIMTEST') >= 0)
+ endif
+ call delete('Xtest_serverlist')
+ endif
+
eval name->remote_foreground()
call remote_send(name, ":let testvar = 'yes'\<CR>")
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 17ac94d69..ae12f6187 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -1121,6 +1121,21 @@ func Test_E_arg()
endif
endfunc
+" Test for the "-D" (debugger) argument
+func Test_D_arg()
+ CheckRunVimInTerminal
+
+ let cmd = GetVimCommandCleanTerm() .. ' -D'
+ let buf = term_start(cmd, {'term_rows' : 10})
+ call WaitForAssert({-> assert_equal("running", term_getstatus(buf))})
+
+ call WaitForAssert({-> assert_equal('Entering Debug mode. Type "cont" to continue.',
+ \ term_getline(buf, 7))})
+ call WaitForAssert({-> assert_equal('>', term_getline(buf, 10))})
+
+ call StopVimInTerminal(buf)
+endfunc
+
" Test for too many edit argument errors
func Test_too_many_edit_args()
" Can't catch the output of gvim.
diff --git a/src/version.c b/src/version.c
index 420480601..be2c759d9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2632,
+/**/
2631,
/**/
2630,