oldtests: Make test output least verbose

Also removes `-` before `rm -rf` as `-f` is supposed to already suppress error.

2 files changed, 31 insertions, 18 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
diff --git a/src/nvim/testdir/runnvim.sh b/src/nvim/testdir/runnvim.sh
index 1acdfb17ab..43556f3ad3 100755
--- a/src/nvim/testdir/runnvim.sh
+++ b/src/nvim/testdir/runnvim.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 main() {(
+  local separator="================================================================================"
   local oldesttest=
   if test "$1" = "--oldesttest" ; then
     shift
@@ -33,18 +34,26 @@ main() {(
     --headless \
     --cmd 'set shortmess+=I noswapfile noundofile nomore' \
     -S runnvim.vim \
-    "$tlog"
+    "$tlog" > "out-$tlog" 2> "err-$tlog"
   then
     fail "$test_name" F "Nvim exited with non-zero code"
   fi
+  echo "Stdout of :terminal runner" >> "$tlog"
+  echo "$separator" >> "$tlog"
+  cat "out-$tlog" >> "$tlog"
+  echo "$separator" >> "$tlog"
+  echo "Stderr of :terminal runner" >> "$tlog"
+  echo "$separator" >> "$tlog"
+  cat "err-$tlog" >> "$tlog"
+  echo "$separator" >> "$tlog"
   if test "$oldesttest" = 1 ; then
     if ! diff -q test.out "$test_name.ok" > /dev/null 2>&1 ; then
       if test -f test.out ; then
         fail "$test_name" F "Oldest test .out file differs from .ok file"
         echo "Diff between test.out and $test_name.ok" >> "$tlog"
-        echo "================================================================================" >> "$tlog"
+        echo "$separator" >> "$tlog"
         diff -a test.out "$test_name.ok" >> "$tlog"
-        echo "================================================================================" >> "$tlog"
+        echo "$separator" >> "$tlog"
       else
         echo "No output in test.out" >> "$tlog"
       fi