From 157baef02636fed4a99ef401e470fee8c51ce852 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 26 Oct 2022 21:53:11 +0800 Subject: vim-patch:8.1.1826: tests use hand coded feature and option checks Problem: Tests use hand coded feature and option checks. Solution: Use the commands from check.vim in more tests. https://github.com/vim/vim/commit/8c5a278fc508da6dfe50e69b6ee734451aa4eafb Omit Test_wincolor(): there are later patches that touch that function. Omit test_memory_usage.vim: a Lua test is used for that file. Cherry-pick Test_issue_3969() from patch 8.1.0969. Co-authored-by: Bram Moolenaar --- src/nvim/testdir/check.vim | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index 4107df99d6..92a51d4371 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -39,6 +39,22 @@ func CheckFunction(name) endif endfunc +" Command to check for the presence of an Ex command +command -nargs=1 CheckCommand call CheckCommand() +func CheckCommand(name) + if !exists(':' .. a:name) + throw 'Skipped: ' .. a:name .. ' command not supported' + endif +endfunc + +" Command to check for the presence of a shell command +command -nargs=1 CheckExecutable call CheckExecutable() +func CheckExecutable(name) + if !executable(a:name) + throw 'Skipped: ' .. a:name .. ' program not executable' + endif +endfunc + " Command to check for the presence of python. Argument should have been " obtained with PythonProg() func CheckPython(name) -- cgit From 24fa5f70edd4cc3b613237283ee7d63af1948c16 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 4 Nov 2022 18:17:26 +0800 Subject: vim-patch:8.2.0448: various functions not properly tested (#20926) Problem: Various functions not properly tested. Solution: Add more tests, especially for failures. (Yegappan Lakshmanan, closes vim/vim#5843) https://github.com/vim/vim/commit/0e05de46226eb4e5ea580beefa71831f92d613d3 Cherry-pick test changes from patch 8.2.0427 and skip Test_has(). Cherry-pick Test_complete_wildmenu() change from patch 8.2.4339. --- src/nvim/testdir/check.vim | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index 92a51d4371..1459b70243 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -4,6 +4,9 @@ source term_util.vim " Command to check for the presence of a feature. command -nargs=1 CheckFeature call CheckFeature() func CheckFeature(name) + " if !has(a:name, 1) + " throw 'Checking for non-existent feature ' .. a:name + " endif if !has(a:name) throw 'Skipped: ' .. a:name .. ' feature missing' endif -- cgit From bfa0be49ed07d1e576c6452bb7e82956df7b19d5 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 6 Nov 2022 22:28:39 +0800 Subject: vim-patch:8.2.2627: no need to check for BSD after checking for not root Problem: No need to check for BSD after checking for not root. Solution: Remove CheckNotBSD. (Ozaki Kiichi, closes vim/vim#7989) https://github.com/vim/vim/commit/4355894869355c185e7810e67d52802453576e81 --- src/nvim/testdir/check.vim | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index 1459b70243..8a1080a2f3 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -90,15 +90,6 @@ func CheckUnix() endif endfunc -" Command to check for not running on a BSD system. -" TODO: using this checks should not be needed -command CheckNotBSD call CheckNotBSD() -func CheckNotBSD() - if has('bsd') - throw 'Skipped: does not work on BSD' - endif -endfunc - " Command to check that making screendumps is supported. " Caller must source screendump.vim command CheckScreendump call CheckScreendump() -- cgit From 1ab08e23b3ba8fed10323ef5572c48413cfa7d96 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 17 Nov 2022 20:18:20 +0800 Subject: vim-patch:8.2.2587: recover test fails on FreeBSD Problem: Recover test fails on FreeBSD. Solution: Check for Linux. https://github.com/vim/vim/commit/6635ae1437e6e343c0514524a8dfb19d9525b908 Co-authored-by: Bram Moolenaar --- src/nvim/testdir/check.vim | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index 8a1080a2f3..61d3a99a67 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -90,6 +90,14 @@ func CheckUnix() endif endfunc +" Command to check for running on Linux +command CheckLinux call CheckLinux() +func CheckLinux() + if !has('linux') + throw 'Skipped: only works on Linux' + endif +endfunc + " Command to check that making screendumps is supported. " Caller must source screendump.vim command CheckScreendump call CheckScreendump() -- cgit From adcf7a221984d61fc472c12875930783bef4e97a Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 5 Dec 2022 09:50:27 +0800 Subject: vim-patch:8.2.3108: test for remote_foreground() fails Problem: Test for remote_foreground() fails. (Elimar Riesebieter) Solution: Check that $DISPLAY is set. (Christian Brabandt) https://github.com/vim/vim/commit/d6fa7bd5b900dd363d3a824e0ebe3619a1634df6 Co-authored-by: Bram Moolenaar --- src/nvim/testdir/check.vim | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index 61d3a99a67..0fba0e107b 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -123,6 +123,14 @@ func CheckCanRunGui() endif endfunc +" Command to Check for an environment variable +command -nargs=1 CheckEnv call CheckEnv() +func CheckEnv(name) + if empty('$' .. a:name) + throw 'Skipped: Environment variable ' .. a:name .. ' is not set' + endif +endfunc + " Command to check that we are using the GUI command CheckGui call CheckGui() func CheckGui() -- cgit From e9ad613fdfd91c7d4b090e404976f9ea8667fae0 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 5 Dec 2022 09:51:01 +0800 Subject: vim-patch:8.2.3109: check for $DISPLAY never fails Problem: Check for $DISPLAY never fails. Solution: Use eval(). https://github.com/vim/vim/commit/f6d877975ba93fc9b4bee2c5d2aff88dbf9bea59 Co-authored-by: Bram Moolenaar --- src/nvim/testdir/check.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index 0fba0e107b..a7ecf455bc 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -126,7 +126,7 @@ endfunc " Command to Check for an environment variable command -nargs=1 CheckEnv call CheckEnv() func CheckEnv(name) - if empty('$' .. a:name) + if empty(eval('$' .. a:name)) throw 'Skipped: Environment variable ' .. a:name .. ' is not set' endif endfunc -- cgit From ba9fcc22ef02c70ffea367bc9fbf22c0dca7c103 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 5 Dec 2022 09:51:39 +0800 Subject: vim-patch:8.2.3526: tests have clumsy check for X11 based GUI Problem: Tests have clumsy check for X11 based GUI. Solution: Add CheckX11BasedGui. https://github.com/vim/vim/commit/40bd5a15405206b130d487af0ca61b5d9b5859f8 Co-authored-by: Bram Moolenaar --- src/nvim/testdir/check.vim | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index a7ecf455bc..d200633115 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -171,6 +171,14 @@ func CheckNotAsan() endif endfunc +" Command to check for X11 based GUI +command CheckX11BasedGui call CheckX11BasedGui() +func CheckX11BasedGui() + if !g:x11_based_gui + throw 'Skipped: requires X11 based GUI' + endif +endfunc + " Command to check for satisfying any of the conditions. " e.g. CheckAnyOf Feature:bsd Feature:sun Linux command -nargs=+ CheckAnyOf call CheckAnyOf() -- cgit From 9ae6b03e7aaf635da5d39c1bd7ff6829cc232acb Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 5 Dec 2022 09:53:31 +0800 Subject: vim-patch:8.2.5145: exit test causes spurious valgrind reports Problem: Exit test causes spurious valgrind reports. Solution: Skip test. Add CheckNotValgrind. https://github.com/vim/vim/commit/cf801d4b95180ddaee1bf633ef482232625dd80b Cherry-pick RunningWithValgrind() from patch 8.2.5136. Co-authored-by: Bram Moolenaar --- src/nvim/testdir/check.vim | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index d200633115..a188f7afa1 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -171,6 +171,14 @@ func CheckNotAsan() endif endfunc +" Command to check for not running under valgrind +command CheckNotValgrind call CheckNotValgrind() +func CheckNotValgrind() + if RunningWithValgrind() + throw 'Skipped: does not work well with valgrind' + endif +endfunc + " Command to check for X11 based GUI command CheckX11BasedGui call CheckX11BasedGui() func CheckX11BasedGui() -- cgit From 2f32b1996744b8ad4ab00f11e09f17c27ad7d866 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 15 Jan 2023 09:08:51 +0800 Subject: vim-patch:8.2.0188: Check commands don't work well with Vim9 script (#21809) Problem: Check commands don't work well with Vim9 script. Solution: Improve constant expression handling. https://github.com/vim/vim/commit/7f829cab356d63b8e59559285593777a66bcc02b Co-authored-by: Bram Moolenaar --- src/nvim/testdir/check.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/nvim/testdir/check.vim') diff --git a/src/nvim/testdir/check.vim b/src/nvim/testdir/check.vim index a188f7afa1..680a59006b 100644 --- a/src/nvim/testdir/check.vim +++ b/src/nvim/testdir/check.vim @@ -1,6 +1,8 @@ source shared.vim source term_util.vim +command -nargs=1 MissingFeature throw 'Skipped: ' .. .. ' feature missing' + " Command to check for the presence of a feature. command -nargs=1 CheckFeature call CheckFeature() func CheckFeature(name) @@ -8,7 +10,7 @@ func CheckFeature(name) " throw 'Checking for non-existent feature ' .. a:name " endif if !has(a:name) - throw 'Skipped: ' .. a:name .. ' feature missing' + MissingFeature a:name endif endfunc -- cgit