aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/Makefile
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2018-03-19 00:53:40 +0300
committerZyX <kp-pav@yandex.ru>2018-03-21 00:54:32 +0300
commit519ff2ad42c820bb21f283223e42b46b375c9a5c (patch)
treec0b2d38a41985c901dbd6cfa89ad785b36a9587c /src/nvim/testdir/Makefile
parent1c0a2a39b65ebf47b9d4997ce84f470c5d09d140 (diff)
downloadrneovim-519ff2ad42c820bb21f283223e42b46b375c9a5c.tar.gz
rneovim-519ff2ad42c820bb21f283223e42b46b375c9a5c.tar.bz2
rneovim-519ff2ad42c820bb21f283223e42b46b375c9a5c.zip
oldtests: Make test output least verbose
Also removes `-` before `rm -rf` as `-f` is supposed to already suppress error.
Diffstat (limited to 'src/nvim/testdir/Makefile')
-rw-r--r--src/nvim/testdir/Makefile34
1 files changed, 19 insertions, 15 deletions
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