From 04de6a64e2f7b3b235acd4ab779bfed30e59451f Mon Sep 17 00:00:00 2001 From: ckelsel Date: Fri, 7 Jul 2017 14:57:50 +0800 Subject: vim-patch:7.4.2189 https://github.com/vim/vim/commit/f71d7b9ee5ceba75f70c30845332ddd728fd16c6 Author: Bram Moolenaar Date: Tue Aug 9 22:14:05 2016 +0200 patch 7.4.2189 Problem: Cannot detect encoding in a fifo. Solution: Extend the stdin way of detecting encoding to fifo. Add a test for detecting encoding on stdin and fifo. (Ken Takata) --- src/nvim/testdir/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 7e55fffa06..510e8820f4 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -62,6 +62,8 @@ NEW_TESTS ?= \ test_signs.res \ test_smartindent.res \ test_stat.res \ + test_startup.res \ + test_startup_utf8.res \ test_substitute.res \ test_syntax.res \ test_tabpage.res \ -- cgit From 3660535f0229afc4ce3391d94794253f685ec400 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 16 Jul 2017 21:17:24 +0300 Subject: oldtests: Use $(TOOL) in place of $(VALGRIND) --- src/nvim/testdir/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 510e8820f4..9ba4e4b3c1 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -201,7 +201,7 @@ nolog: # New style of tests uses Vim script with assert calls. These are easier # to write and a lot easier to read and debug. # Limitation: Only works with the +eval feature. -RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(NVIM_PRG) -u unix.vim -U NONE --noplugin +RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE --noplugin newtests: newtestssilent @/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \ -- cgit From 347dd9476ae2c77ebfc96abda928a342f26fe677 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 30 Jul 2017 20:52:00 -0400 Subject: oldtests: Run nvim using --headless to avoid requesting user input MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Certain functions (e.g. feedkeys(…, 'x!') and input()) will attempt to read from stdin, which shouldn't be expected to work during oldtests. In Debian/Ubuntu's build environment, it explicitly can't work because /dev/null is redirected to stdin, which causes read_error_exit() to exit. Running oldtests with --headless prevents nvim from setting up its input handling, thus avoiding the problem altogether. Reference #6794 --- src/nvim/testdir/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 510e8820f4..b45bd6ee14 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -132,7 +132,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(NVIM_PRG) test1.out RM_ON_RUN := test.out X* viminfo RM_ON_START := test.ok -RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --noplugin -s dotest.in +RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --headless --noplugin -s dotest.in clean: -rm -rf *.out \ @@ -201,7 +201,7 @@ nolog: # New style of tests uses Vim script with assert calls. These are easier # to write and a lot easier to read and debug. # Limitation: Only works with the +eval feature. -RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(NVIM_PRG) -u unix.vim -U NONE --noplugin +RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(NVIM_PRG) -u unix.vim -U NONE --headless --noplugin newtests: newtestssilent @/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \ -- cgit From 36ceb9397c7fc383356e54ea8eab8fa3d6cefb1f Mon Sep 17 00:00:00 2001 From: lonerover Date: Mon, 7 Aug 2017 05:00:19 +0800 Subject: vim-patch:8.0.0086 (#7118) Problem: Cannot add a comment after ":hide". (Norio Takagi) Solution: Make it work, add a test. (Hirohito Higashi) https://github.com/vim/vim/commit/2256c9947164229c0960803e2a2992b793c23298 --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index b45bd6ee14..944222dbb6 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -45,6 +45,7 @@ NEW_TESTS ?= \ test_gn.res \ test_hardcopy.res \ test_help_tagjump.res \ + test_hide.res \ test_history.res \ test_hlsearch.res \ test_increment.res \ -- cgit From 9854fc4657d7cd0791f8abd7c9128fdf20d14d15 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Tue, 8 Aug 2017 20:29:41 +0200 Subject: oldtest: use TMPDIR --- src/nvim/testdir/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 944222dbb6..7f1e25900b 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -3,10 +3,12 @@ # NVIM_PRG ?= ../../../build/bin/nvim +TMPDIR ?= Xtest-tmpdir SCRIPTSOURCE := ../../../runtime export SHELL := sh export NVIM_PRG := $(NVIM_PRG) +export TMPDIR SCRIPTS ?= \ test13.out \ @@ -149,10 +151,12 @@ clean: .*.swp \ .*.swo \ .gdbinit \ + $(TMPDIR) \ del test1.out: .gdbinit test1.in -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize + mkdir -p $(TMPDIR) $(RUN_VIM) $*.in @/bin/sh -c "if test -e wrongtermsize; then \ echo; \ @@ -170,6 +174,7 @@ test1.out: .gdbinit test1.in %.out: %.in .gdbinit -rm -rf $*.failed test.ok $(RM_ON_RUN) + mkdir -p $(TMPDIR) cp $*.ok test.ok # Sleep a moment to avoid that the xterm title is messed up. # 200 msec is sufficient, but only modern sleep supports a fraction of @@ -212,4 +217,5 @@ newtests: newtestssilent newtestssilent: $(NEW_TESTS) %.res: %.vim .gdbinit + mkdir -p $(TMPDIR) $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim -- cgit From f8dcd319d9338cccc66ae481d5865e8816794306 Mon Sep 17 00:00:00 2001 From: Michael Schupikov Date: Sat, 23 Sep 2017 08:32:29 +0200 Subject: vim-patch:8.0.0294 (#7305) Problem: Argument list is not stored correctly in a session file. (lgpasquale) Solution: Use "$argadd" instead of "argadd". (closes vim/vim#1434) https://github.com/vim/vim/commit/79da563cf9220b9abb83455a68d995684133ea56 Signed-off-by: Michael Schupikov --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 96de7224c5..9133bfc0a2 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -58,6 +58,7 @@ NEW_TESTS ?= \ test_match.res \ test_matchadd_conceal.res \ test_matchadd_conceal_utf8.res \ + test_mksession.res \ test_nested_function.res \ test_normal.res \ test_quickfix.res \ -- cgit From f1242c2a26f51c53c6f248666023a919f93d72fa Mon Sep 17 00:00:00 2001 From: James McCoy Date: Wed, 27 Sep 2017 08:27:31 -0400 Subject: oldtest: Run test_mksession_utf8 tests --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 9133bfc0a2..38caa8815d 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -59,6 +59,7 @@ NEW_TESTS ?= \ test_matchadd_conceal.res \ test_matchadd_conceal_utf8.res \ test_mksession.res \ + test_mksession_utf8.res \ test_nested_function.res \ test_normal.res \ test_quickfix.res \ -- cgit From aab16e6939a45b3c08f21cd4b5f348e9e612d947 Mon Sep 17 00:00:00 2001 From: ckelsel Date: Fri, 27 Oct 2017 09:41:41 +0800 Subject: vim-patch:8.0.0189 Problem: There are no tests for the :profile command. Solution: Add tests. (Dominique Pelle, closes vim/vim#1383) https://github.com/vim/vim/commit/296b1f28ca9cedeb55872f306808b2214b519ce7 --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 38caa8815d..fb68292c77 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -62,6 +62,7 @@ NEW_TESTS ?= \ test_mksession_utf8.res \ test_nested_function.res \ test_normal.res \ + test_profile.res \ test_quickfix.res \ test_search.res \ test_signs.res \ -- cgit From 122f52bf897abd1cda4fa467157657fee6bcfe94 Mon Sep 17 00:00:00 2001 From: KunMing Xie Date: Sun, 29 Oct 2017 00:05:59 +0800 Subject: vim-patch:8.0.0206 (#7446) Problem: Test coverage for :retab insufficient. Solution: Add test for :retab. (Dominique Pelle, closes vim/vim#1391) https://github.com/vim/vim/commit/8822744b4d9d40aa1fd59870a8bdd7c64c59a42b --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 38caa8815d..979021ff92 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -63,6 +63,7 @@ NEW_TESTS ?= \ test_nested_function.res \ test_normal.res \ test_quickfix.res \ + test_retab.res \ test_search.res \ test_signs.res \ test_smartindent.res \ -- cgit From 9393be477a733183c2a992cc8728e3ebc65a3118 Mon Sep 17 00:00:00 2001 From: KunMing Xie Date: Wed, 22 Nov 2017 18:59:30 +0800 Subject: vim-patch:8.0.0289 (#7591) Problem: No test for "ga" and :ascii. Solution: Add a test. (Dominique Pelle, closes vim/vim#1429) https://github.com/vim/vim/commit/21d7c9b601f3048e1293ecd6c09b8325a15503cd --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index ccf999c7ee..111bd172ef 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -42,6 +42,7 @@ NEW_TESTS ?= \ test_filter_map.res \ test_fnameescape.res \ test_fold.res \ + test_ga.res \ test_glob2regpat.res \ test_gf.res \ test_gn.res \ -- cgit From 4a5bc6275d09056ff0ccf5a29a878d48bbe58655 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 8 Dec 2017 10:42:30 -0500 Subject: ci: run oldtests in Appveyor #7705 --- src/nvim/testdir/Makefile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 111bd172ef..e1faaccb84 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -2,7 +2,11 @@ # Makefile to run all tests for Vim # -NVIM_PRG ?= ../../../build/bin/nvim +ifeq ($(OS),Windows_NT) + NVIM_PRG ?= ../../../build/bin/nvim.exe +else + NVIM_PRG ?= ../../../build/bin/nvim +endif TMPDIR ?= Xtest-tmpdir SCRIPTSOURCE := ../../../runtime @@ -10,12 +14,9 @@ export SHELL := sh export NVIM_PRG := $(NVIM_PRG) export TMPDIR -SCRIPTS ?= \ - test13.out \ +SCRIPTS_DEFAULT = \ test14.out \ - test17.out \ test24.out \ - test32.out \ test37.out \ test40.out \ test42.out \ @@ -27,6 +28,15 @@ SCRIPTS ?= \ test73.out \ test79.out \ +ifneq ($(OS),Windows_NT) + SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \ + test17.out \ + test32.out \ + +endif + +SCRIPTS ?= $(SCRIPTS_DEFAULT) + # Tests using runtest.vim. # Keep test_alot*.res as the last one, sort the others. NEW_TESTS ?= \ -- cgit From c162bc629440afaf8910f1a29f1dfdb03f898101 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 16 Dec 2017 21:50:20 -0500 Subject: vim-patch:8.0.0420: text garbled when the system encoding differs from 'encoding' Problem: When running :make the output may be in the system encoding, different from 'encoding'. Solution: Add the 'makeencoding' option. (Ken Takata) https://github.com/vim/vim/commit/2c7292dc5bbf155fe2192d417363b8c085759cad --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index e1faaccb84..1f8cf8a0e7 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -65,6 +65,7 @@ NEW_TESTS ?= \ test_increment_dbcs.res \ test_lambda.res \ test_langmap.res \ + test_makeencoding.res \ test_marks.res \ test_match.res \ test_matchadd_conceal.res \ -- cgit From 321a46b724ccb2e574875cf18c8d280f8516527c Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 1 Jan 2018 16:21:55 +0100 Subject: vim-patch: b:changedtick-related patches vim-patch:8.0.0334 vim-patch:8.0.0335 vim-patch:8.0.0343 vim-patch:8.0.0345 Problem: Can't access b:changedtick from a dict reference. Solution: Make changedtick a member of the b: dict. (inspired by neovim vim/vim#6112) https://github.com/vim/vim/commit/79518e2ace5fce7b9c49060e462a6e935dba0a84 vim-patch:8.0.0343: b:changedtick can be unlocked Problem: b:changedtick can be unlocked, even though it has no effect. (Nikolai Pavlov) Solution: Add a check and error E940. (closes #1496) vim-patch:8.0.0345: islocked('d.changedtick') does not work Problem: islocked('d.changedtick') does not work. Solution: Make it work. vim-patch:8.0.0335: functions test fails Problem: Functions test fails. Solution: Use the right buffer number. https://github.com/vim/vim/commit/507647da3151f7ffccac1b217936240daa79849c --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 1f8cf8a0e7..5af8dd20cd 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -42,6 +42,7 @@ SCRIPTS ?= $(SCRIPTS_DEFAULT) NEW_TESTS ?= \ test_autocmd.res \ test_bufwintabinfo.res \ + test_changedtick.res \ test_charsearch.res \ test_cmdline.res \ test_command_count.res \ -- cgit From 9ddeb6e187e6ef6045bf037e4225dc46c8efb693 Mon Sep 17 00:00:00 2001 From: KunMing Xie Date: Sun, 14 Jan 2018 02:26:21 +0800 Subject: vim-patch:8.0.0364 (#7837) vim-patch:8.0.0364: ]s does not move cursor with two spell errors in one line Problem: ]s does not move cursor with two spell errors in one line. (Manuel Ortega) Solution: Don't stop search immediately when wrapped, search the line first. (Ken Takata) Add a test. https://github.com/vim/vim/commit/d3f78dc9ebd729475a7f24a50a91112e300d5ac9 * disable spell test for now --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 5af8dd20cd..a23dacba15 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -81,6 +81,7 @@ NEW_TESTS ?= \ test_search.res \ test_signs.res \ test_smartindent.res \ + test_spell.res \ test_stat.res \ test_startup.res \ test_startup_utf8.res \ -- cgit From fe4ba6995895f95f461d40eda356cc7e1dbb1abf Mon Sep 17 00:00:00 2001 From: ckelsel Date: Sun, 14 Jan 2018 20:52:51 +0800 Subject: vim-patch:8.0.0385: no tests for arabic Problem: No tests for arabic. Solution: Add a first test for arabic. (Dominique Pelle, closes vim/vim#1518) https://github.com/vim/vim/commit/b5e8377364110ee70090274da15d202778e96a64 --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index a23dacba15..0c25945274 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -40,6 +40,7 @@ SCRIPTS ?= $(SCRIPTS_DEFAULT) # Tests using runtest.vim. # Keep test_alot*.res as the last one, sort the others. NEW_TESTS ?= \ + test_arabic.vim \ test_autocmd.res \ test_bufwintabinfo.res \ test_changedtick.res \ -- cgit From f8f7f9d5f5aead86541ffcd12e291b6dfb6811e5 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 15 Jan 2018 23:14:20 +0100 Subject: vim-patch:8.0.0151,3,4 #7389 vim-patch:8.0.0151 Problem: To pass buffer content to system() and systemlist() one has to first create a string or list. Solution: Allow passing a buffer number. (LemonBoy, closes vim/vim#1240) https://github.com/vim/vim/commit/12c4492dd35e0cd83c8816be2ec849b836109882 vim-patch:8.0.0153 Problem: system() test fails on MS-Windows. Solution: Deal when extra space and CR. https://github.com/vim/vim/commit/9d9c35651712b88c81f1ae11091de1fd0bbbd35c vim-patch:8.0.0154 Problem: system() test fails on OS/X. Solution: Deal with leading spaces. https://github.com/vim/vim/commit/31f19ce0a052f7c76d44a9a190e468c79cf5d56d --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 0c25945274..c1e6eedf94 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -88,6 +88,7 @@ NEW_TESTS ?= \ test_startup_utf8.res \ test_substitute.res \ test_syntax.res \ + test_system.res \ test_tabpage.res \ test_textobjects.res \ test_timers.res \ -- cgit From b00fd496405e0864e3cb5cc8b62241fb9610480f Mon Sep 17 00:00:00 2001 From: ckelsel Date: Sat, 20 Jan 2018 15:47:56 +0800 Subject: vim-patch:8.0.0423: changing 'cinoptions' does not always work Problem: The effect of adding "vim/vim#" to 'cinoptions' is not always removed. (David Briscoe) Solution: Reset b_ind_hash_comment. (Christian Brabandt, closes vim/vim#1475) https://github.com/vim/vim/commit/6b64394f346594404cffb9591d71ac693040679f --- src/nvim/testdir/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index c1e6eedf94..18f0bac3cf 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -40,11 +40,12 @@ SCRIPTS ?= $(SCRIPTS_DEFAULT) # Tests using runtest.vim. # Keep test_alot*.res as the last one, sort the others. NEW_TESTS ?= \ - test_arabic.vim \ + test_arabic.res \ test_autocmd.res \ test_bufwintabinfo.res \ test_changedtick.res \ test_charsearch.res \ + test_cindent.res \ test_cmdline.res \ test_command_count.res \ test_cscope.res \ -- cgit From 9db4dc971dd9357c57dbfeae3ec535033c38743b Mon Sep 17 00:00:00 2001 From: ckelsel Date: Sat, 2 Dec 2017 16:26:30 +0800 Subject: vim-patch:8.0.0301 #7685 Problem: No tests for ":set completion" and various errors of the :set command. Solution: Add more :set tests. (Dominique Pelle, closes vim/vim#1440) https://github.com/vim/vim/commit/698f8b207bbfefa1cbbd7361caf5412cb3416534 --- Also move test_options from test_alot to Makefile. (That's done upstream in Vim patch 8.0.0430.) --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 18f0bac3cf..2dc42be652 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -77,6 +77,7 @@ NEW_TESTS ?= \ test_mksession_utf8.res \ test_nested_function.res \ test_normal.res \ + test_options.res \ test_profile.res \ test_quickfix.res \ test_retab.res \ -- cgit From 5d88830d51100a69126e9aa31bbd50574923cb05 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Tue, 23 Jan 2018 23:05:45 +0100 Subject: test/old: always set $TMPDIR On macOS $TMPDIR defaults to something very long. There's not really a need to support overriding the $TMPDIR used by tests, so always use the workspace-local path "Xtest-tmpdir". --- src/nvim/testdir/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 2dc42be652..5a6e03f182 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -7,12 +7,11 @@ ifeq ($(OS),Windows_NT) else NVIM_PRG ?= ../../../build/bin/nvim endif -TMPDIR ?= Xtest-tmpdir SCRIPTSOURCE := ../../../runtime export SHELL := sh export NVIM_PRG := $(NVIM_PRG) -export TMPDIR +export TMPDIR := Xtest-tmpdir SCRIPTS_DEFAULT = \ test14.out \ -- cgit From 8821579baa9d779335cd2c2331336acd8d74b9d7 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 28 Jan 2018 13:16:33 +0100 Subject: test/old: $TMPDIR must be absolute Internals `chdir` here and there, this causes relative $TMPDIR to break some things. Don't know why this only happened on macOS... --- src/nvim/testdir/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 5a6e03f182..b945b29683 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -11,7 +11,7 @@ SCRIPTSOURCE := ../../../runtime export SHELL := sh export NVIM_PRG := $(NVIM_PRG) -export TMPDIR := Xtest-tmpdir +export TMPDIR := $(abspath ../../../Xtest-tmpdir) SCRIPTS_DEFAULT = \ test14.out \ -- cgit From 649123d07c13d3314b7f97abdd3d8094b32fbefe Mon Sep 17 00:00:00 2001 From: KunMing Xie Date: Wed, 31 Jan 2018 04:21:29 +0800 Subject: vim-patch:8.0.0358,8.0.0359 (#7832) vim-patch:8.0.0358: invalid memory access in C-indent code Problem: Invalid memory access in C-indent code. Solution: Don't go over end of empty line. (Dominique Pelle, closes vim/vim#1492) https://github.com/vim/vim/commit/60629d642541a089c322e65963c0a77e5f77eb79 vim-patch:8.0.0359: 'number' and 'relativenumber' are not properly tested Problem: 'number' and 'relativenumber' are not properly tested. Solution: Add tests, change old style to new style tests. (Ozaki Kiichi, closes vim/vim#1447) https://github.com/vim/vim/commit/dc9a081712ec8c140e6d4909e9f6b03a629d32d3 --- src/nvim/testdir/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index b945b29683..bd9842ea19 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -52,6 +52,7 @@ NEW_TESTS ?= \ test_diffmode.res \ test_farsi.res \ test_filter_map.res \ + test_findfile.res \ test_fnameescape.res \ test_fold.res \ test_ga.res \ @@ -76,6 +77,7 @@ NEW_TESTS ?= \ test_mksession_utf8.res \ test_nested_function.res \ test_normal.res \ + test_number.res \ test_options.res \ test_profile.res \ test_quickfix.res \ -- cgit From c8356e1151cf6db8cad93f74973a7452e62d6be0 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 1 Feb 2018 23:32:43 +0100 Subject: vim-patch:8.0.0440: not enough test coverage in Insert mode [Nvim note: test_override() omitted] Problem: Not enough test coverage in Insert mode. Solution: Add lots of tests. Add test_override(). (Christian Brabandt, closes vim/vim#1521) https://github.com/vim/vim/commit/eb992cb90fd79c77ad2743459ac898e6ac3de939 --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index bd9842ea19..4d76e425f0 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -49,6 +49,7 @@ NEW_TESTS ?= \ test_command_count.res \ test_cscope.res \ test_digraph.res \ + test_edit.res \ test_diffmode.res \ test_farsi.res \ test_filter_map.res \ -- cgit From 54b9510e0572694e57d34d38e006b5e570850dea Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 2 Feb 2018 00:45:08 +0100 Subject: vim-patch:8.0.1158: still old style tests Problem: Still old style tests. Solution: Convert serveral tests to new style. (Yegappan Lakshmanan) https://github.com/vim/vim/commit/db51007108a6ab0671e7f7b4844557cbe647185f --- src/nvim/testdir/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 4d76e425f0..b0356e050e 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -22,7 +22,6 @@ SCRIPTS_DEFAULT = \ test48.out \ test49.out \ test52.out \ - test53.out \ test64.out \ test73.out \ test79.out \ -- cgit From cbecae46f4b098cd6018055c7f4c70bd147c7938 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 2 Feb 2018 00:57:49 +0100 Subject: vim-patch:8.0.0861: still many old style tests Problem: Still many old style tests. Solution: Convert several tests to new style. (Yegappan Lakshmanan) https://github.com/vim/vim/commit/4a137b45864310060410f34cb9c7d0f0231bb256 vim-patch:8.0.0862: file size test fails on MS-Windows Problem: File size test fails on MS-Windows. Solution: Set fileformat after opening new buffer. Strip CR. https://github.com/vim/vim/commit/07c043af5f054c7dfeb676414f8fa6aeda8f9c2b --- src/nvim/testdir/Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index b0356e050e..1b927076d8 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -47,10 +47,12 @@ NEW_TESTS ?= \ test_cmdline.res \ test_command_count.res \ test_cscope.res \ + test_curswant.res \ test_digraph.res \ test_edit.res \ test_diffmode.res \ test_farsi.res \ + test_file_size.res \ test_filter_map.res \ test_findfile.res \ test_fnameescape.res \ @@ -68,6 +70,8 @@ NEW_TESTS ?= \ test_increment_dbcs.res \ test_lambda.res \ test_langmap.res \ + test_let.res \ + test_lineending.res \ test_makeencoding.res \ test_marks.res \ test_match.res \ @@ -82,6 +86,7 @@ NEW_TESTS ?= \ test_profile.res \ test_quickfix.res \ test_retab.res \ + test_scrollbind.res \ test_search.res \ test_signs.res \ test_smartindent.res \ -- cgit From 4c1afd1e83cee67bf447c64f9042331f0ee5d103 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 2 Feb 2018 01:34:10 +0100 Subject: vim-patch:8.0.0337: invalid memory access in :recover command Problem: Invalid memory access in :recover command. Solution: Avoid access before directory name. (Dominique Pelle, closes vim/vim#1488) https://github.com/vim/vim/commit/c525e3a1c20f6b5d9809c8b84f80090a8e416c92 --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 1b927076d8..5e5671787e 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -85,6 +85,7 @@ NEW_TESTS ?= \ test_options.res \ test_profile.res \ test_quickfix.res \ + test_recover.res \ test_retab.res \ test_scrollbind.res \ test_search.res \ -- cgit From ce92e784e14615ba2305105ae2573e3aae49946f Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 2 Feb 2018 01:42:17 +0100 Subject: vim-patch:8.0.1186: still quite a few old style tests Problem: Still quite a few old style tests. Solution: Convert old to new style tests. (Yegappan Lakshmanan) Avoid ringing the bell while running tests. https://github.com/vim/vim/commit/4a6fcf8047de13c7949ab2f27f7774acaec4ae4d --- src/nvim/testdir/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 5e5671787e..3b9899870f 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -50,6 +50,7 @@ NEW_TESTS ?= \ test_curswant.res \ test_digraph.res \ test_edit.res \ + test_exists.res \ test_diffmode.res \ test_farsi.res \ test_file_size.res \ @@ -105,6 +106,7 @@ NEW_TESTS ?= \ test_usercommands.res \ test_vimscript.res \ test_visual.res \ + test_winbuf_close.res \ test_window_id.res \ test_writefile.res \ test_alot.res -- cgit From 2de447b60c04fcaad3d762851c512b2545ea6bad Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 2 Feb 2018 23:14:30 +0100 Subject: vim-patch:8.0.1221: still too many old style tests Problem: Still too many old style tests. Solution: Convert a few more tests to new style. (Yegappan Lakshmanan, closes vim/vim#2256) https://github.com/vim/vim/commit/15993ce9210e8b8d4bc11e1d640f6447b18d3e6c --- src/nvim/testdir/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 3b9899870f..aa5d534530 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -24,12 +24,10 @@ SCRIPTS_DEFAULT = \ test52.out \ test64.out \ test73.out \ - test79.out \ ifneq ($(OS),Windows_NT) SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \ test17.out \ - test32.out \ endif @@ -69,6 +67,7 @@ NEW_TESTS ?= \ test_hlsearch.res \ test_increment.res \ test_increment_dbcs.res \ + test_ins_complete.res \ test_lambda.res \ test_langmap.res \ test_let.res \ @@ -99,6 +98,7 @@ NEW_TESTS ?= \ test_substitute.res \ test_syntax.res \ test_system.res \ + test_tab.res \ test_tabpage.res \ test_textobjects.res \ test_timers.res \ -- cgit From ff4a628081c3fb50ea064353030a98375332cc23 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 11 Feb 2018 19:30:26 +0100 Subject: test/old: restore test_alot_utf8.vim Needed for later Vim patches. Stub test_alot_latin.vim to avoid merge-conflict noise. vim-patch:7.4.1700 vim-patch:7.4.1734 vim-patch:7.4.1740 vim-patch:7.4.2086 vim-patch:7.4.2223 vim-patch:8.0.0250 --- src/nvim/testdir/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index aa5d534530..13fd0fcf62 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -109,6 +109,8 @@ NEW_TESTS ?= \ test_winbuf_close.res \ test_window_id.res \ test_writefile.res \ + test_alot_latin.res \ + test_alot_utf8.res \ test_alot.res SCRIPTS_GUI := test16.out -- cgit From aaff91d925b1ae7a0a29b2572662612c972234d0 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 11 Feb 2018 20:22:42 +0100 Subject: vim-patch:8.0.0311: linebreak tests are old style Problem: Linebreak tests are old style. Solution: Turn the tests into new style. Share utility functions. (Ozaki Kiichi, closes vim/vim#1444) https://github.com/vim/vim/commit/544d3bc9f0e494cb712a33b61558b8e8e12b1e0b --- src/nvim/testdir/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 13fd0fcf62..30fdb06cc9 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -70,6 +70,8 @@ NEW_TESTS ?= \ test_ins_complete.res \ test_lambda.res \ test_langmap.res \ + test_listlbr.res \ + test_listlbr_utf8.res \ test_let.res \ test_lineending.res \ test_makeencoding.res \ -- cgit From 43631675d82be89b81a8f644dab9509750ca0bf0 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 11 Feb 2018 20:24:52 +0100 Subject: vim-patch:8.0.1333: some tests are run twice Problem: Some tests are run twice. Solution: Invoked most utf8 tests only from test_alot_utf8. (Yegappan Lakshmanan, closes vim/vim#2369) https://github.com/vim/vim/commit/2c997d76034d5294c92305108357daef6feabd95 --- src/nvim/testdir/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 30fdb06cc9..dddeadb080 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -71,16 +71,13 @@ NEW_TESTS ?= \ test_lambda.res \ test_langmap.res \ test_listlbr.res \ - test_listlbr_utf8.res \ test_let.res \ test_lineending.res \ test_makeencoding.res \ test_marks.res \ test_match.res \ test_matchadd_conceal.res \ - test_matchadd_conceal_utf8.res \ test_mksession.res \ - test_mksession_utf8.res \ test_nested_function.res \ test_normal.res \ test_number.res \ @@ -96,7 +93,6 @@ NEW_TESTS ?= \ test_spell.res \ test_stat.res \ test_startup.res \ - test_startup_utf8.res \ test_substitute.res \ test_syntax.res \ test_system.res \ -- cgit From ef39f854d7deda34ecf158cbae1165c7ec18102c Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 11 Feb 2018 23:04:32 +0100 Subject: vim-patch:8.0.1302: still too many old style tests Problem: Still too many old style tests. Solution: Convert a few more tests to new style. (Yegappan Lakshmanan, closes vim/vim#2326) https://github.com/vim/vim/commit/209d3874c19d73b209e7d223cf05ea22e183f408 --- src/nvim/testdir/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index dddeadb080..ba4e5347a1 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -23,7 +23,6 @@ SCRIPTS_DEFAULT = \ test49.out \ test52.out \ test64.out \ - test73.out \ ifneq ($(OS),Windows_NT) SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \ @@ -42,17 +41,21 @@ NEW_TESTS ?= \ test_changedtick.res \ test_charsearch.res \ test_cindent.res \ + test_close_count.res \ test_cmdline.res \ test_command_count.res \ test_cscope.res \ test_curswant.res \ test_digraph.res \ test_edit.res \ + test_erasebackword.res \ test_exists.res \ test_diffmode.res \ test_farsi.res \ test_file_size.res \ test_filter_map.res \ + test_find_complete.res \ + test_fixeol.res \ test_findfile.res \ test_fnameescape.res \ test_fold.res \ @@ -73,6 +76,7 @@ NEW_TESTS ?= \ test_listlbr.res \ test_let.res \ test_lineending.res \ + test_listchars.res \ test_makeencoding.res \ test_marks.res \ test_match.res \ -- cgit From 5191f963bf7c889360154af35c414a1fe83ce4ba Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 11 Feb 2018 23:47:43 +0100 Subject: test/old: skip encoding=latin1 test --- src/nvim/testdir/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index ba4e5347a1..a1010b9d39 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -73,7 +73,6 @@ NEW_TESTS ?= \ test_ins_complete.res \ test_lambda.res \ test_langmap.res \ - test_listlbr.res \ test_let.res \ test_lineending.res \ test_listchars.res \ -- cgit From c68d89521fc92834086abb6ad5ed12327b62ff60 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 12 Feb 2018 00:05:54 +0100 Subject: vim-patch:8.0.1271: still too many old style tests Problem: Still too many old style tests. Solution: Convert a few more tests to new style. (Yegappan Lakshmanan, closes vim/vim#2290) https://github.com/vim/vim/commit/fb094e14c19337de824d4e6710ca6a2617930ab0 --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index a1010b9d39..211ee974fb 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -75,6 +75,7 @@ NEW_TESTS ?= \ test_langmap.res \ test_let.res \ test_lineending.res \ + test_listdict.res \ test_listchars.res \ test_makeencoding.res \ test_marks.res \ -- cgit From ec02d9aad6b3015b1802476521a65234c70b0574 Mon Sep 17 00:00:00 2001 From: KunMing Xie Date: Wed, 21 Feb 2018 04:44:37 +0800 Subject: vim-patch:8.0.0222: blockwise put on multi-byte char (#8030) Note: code change was covered by c2a18216114bae75b6d6a2c7f1a68db04578abce Problem: When a multi-byte character ends in a zero byte, putting blockwise text puts it before the character instead of after it. Solution: Use int instead of char for the character under the cursor. (Luchr, closes vim/vim#1403) Add a test. https://github.com/vim/vim/commit/c81299684b2b9045e56525d3da3f45e8440fbf0d --- src/nvim/testdir/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 211ee974fb..418463a0ad 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -87,6 +87,7 @@ NEW_TESTS ?= \ test_number.res \ test_options.res \ test_profile.res \ + test_put.res \ test_quickfix.res \ test_recover.res \ test_retab.res \ -- cgit From 1c0a2a39b65ebf47b9d4997ce84f470c5d09d140 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 18 Mar 2018 02:38:27 +0300 Subject: oldtests: Run old tests in :terminal Reasoning: - No need to check for terminal size. - No need to mess with terminal title. - Allows old tests to timeout with the rest of the build proceeding. - Less and less messy output to travis log. - Opens a path allowing old tests run in parallel. Though last bit needs test refactoring. --- src/nvim/testdir/Makefile | 46 +++++++++------------------------------------- 1 file changed, 9 insertions(+), 37 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 418463a0ad..e6e8ddb4d3 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -7,7 +7,7 @@ ifeq ($(OS),Windows_NT) else NVIM_PRG ?= ../../../build/bin/nvim endif -SCRIPTSOURCE := ../../../runtime +ROOT := ../../.. export SHELL := sh export NVIM_PRG := $(NVIM_PRG) @@ -134,7 +134,7 @@ ifdef USE_VALGRIND $(VALGRIND_TOOL) \ --suppressions=../../.valgrind.supp \ --error-exitcode=123 \ - --log-file=valgrind.\%p.$* \ + --log-file=valgrind-\%p.$* \ $(VGDB) \ --trace-children=yes else @@ -171,7 +171,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(NVIM_PRG) test1.out RM_ON_RUN := test.out X* viminfo RM_ON_START := test.ok -RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --headless --noplugin -s dotest.in +RUN_VIM := $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --headless --noplugin -s dotest.in clean: -rm -rf *.out \ @@ -179,6 +179,7 @@ clean: *.res \ *.rej \ *.orig \ + *.tlog \ test.log \ messages \ $(RM_ON_RUN) \ @@ -193,45 +194,16 @@ clean: test1.out: .gdbinit test1.in -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize mkdir -p $(TMPDIR) - $(RUN_VIM) $*.in - @/bin/sh -c "if test -e wrongtermsize; then \ - echo; \ - echo test1 FAILED - terminal size must be 80x24 or larger; \ - echo; exit 1; \ - elif diff test.out $*.ok; then \ - mv -f test.out $*.out; \ - else \ - echo; \ - echo test1 FAILED - Something basic is wrong; \ - echo; \ - exit 1; \ - fi" + /bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in + -rm -f wrongtermsize -rm -rf X* viminfo %.out: %.in .gdbinit -rm -rf $*.failed test.ok $(RM_ON_RUN) mkdir -p $(TMPDIR) cp $*.ok test.ok - # Sleep a moment to avoid that the xterm title is messed up. - # 200 msec is sufficient, but only modern sleep supports a fraction of - # a second, fall back to a second if it fails. - @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" - $(RUN_VIM) $*.in + /bin/sh runnvim.sh --oldesttest $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in - # Check if the test.out file matches test.ok. - @/bin/sh -c "if test -f test.out; then \ - if diff -u test.out $*.ok; then \ - mv -f test.out $*.out; \ - else \ - echo $* FAILED >> test.log; \ - mv -f test.out $*.failed; \ - fi; \ - else \ - echo $* NO OUTPUT >>test.log; \ - fi" - @/bin/sh -c "if test -f valgrind; then \ - mv -f valgrind valgrind.$*; \ - fi" -rm -rf X* test.ok viminfo test49.out: test49.vim @@ -243,7 +215,7 @@ nolog: # New style of tests uses Vim script with assert calls. These are easier # to write and a lot easier to read and debug. # Limitation: Only works with the +eval feature. -RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE --headless --noplugin +RUN_VIMTEST = $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE --headless --noplugin newtests: newtestssilent @/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \ @@ -254,4 +226,4 @@ newtestssilent: $(NEW_TESTS) %.res: %.vim .gdbinit mkdir -p $(TMPDIR) - $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim + /bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim -- cgit From 519ff2ad42c820bb21f283223e42b46b375c9a5c Mon Sep 17 00:00:00 2001 From: ZyX Date: Mon, 19 Mar 2018 00:53:40 +0300 Subject: oldtests: Make test output least verbose Also removes `-` before `rm -rf` as `-f` is supposed to already suppress error. --- src/nvim/testdir/Makefile | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index e6e8ddb4d3..280976a4ab 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -152,7 +152,8 @@ nongui: nolog $(SCRIPTS) newtests report gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) newtests report .gdbinit: - echo 'set $$_exitcode = -1\nrun\nif $$_exitcode != -1\n quit\nend' > .gdbinit + @echo "[OLDTEST-PREP] Setting up .gdbinit" + @echo 'set $$_exitcode = -1\nrun\nif $$_exitcode != -1\n quit\nend' > .gdbinit report: @echo @@ -192,24 +193,26 @@ clean: del test1.out: .gdbinit test1.in - -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize - mkdir -p $(TMPDIR) - /bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in - -rm -f wrongtermsize - -rm -rf X* viminfo + @echo "[OLDTEST-PREP] Running test1" + @rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize + @mkdir -p $(TMPDIR) + @/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in + @rm -f wrongtermsize + @rm -rf X* viminfo %.out: %.in .gdbinit - -rm -rf $*.failed test.ok $(RM_ON_RUN) - mkdir -p $(TMPDIR) - cp $*.ok test.ok - /bin/sh runnvim.sh --oldesttest $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in - - -rm -rf X* test.ok viminfo + @echo "[OLDESTTEST] Running" $* + @rm -rf $*.failed test.ok $(RM_ON_RUN) + @mkdir -p $(TMPDIR) + @cp $*.ok test.ok + @/bin/sh runnvim.sh --oldesttest $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in + @rm -rf X* test.ok viminfo test49.out: test49.vim nolog: - -rm -f test.log messages + @echo "[OLDTEST-PREP] Removing test.log and messages" + @rm -f test.log messages # New style of tests uses Vim script with assert calls. These are easier @@ -225,5 +228,6 @@ newtests: newtestssilent newtestssilent: $(NEW_TESTS) %.res: %.vim .gdbinit - mkdir -p $(TMPDIR) - /bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim + @echo "[OLDTESTS] Running" $* + @mkdir -p $(TMPDIR) + @/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim -- cgit