mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

oldtests: Make test output least verbose

Browse Source 
Also removes `-` before `rm -rf` as `-f` is supposed to already suppress error.
This commit is contained in:
ZyX
2018-03-19 00:53:40 +03:00
parent 1c0a2a39b6
commit 519ff2ad42
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/nvim/testdir/Makefile
View File

@@ -152,7 +152,8 @@ nongui: nolog $(SCRIPTS) newtests report
gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) newtests report gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) newtests report
.gdbinit: .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: report:
@echo @echo
@@ -192,24 +193,26 @@ clean:
del del
test1.out: .gdbinit test1.in test1.out: .gdbinit test1.in
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize @echo "[OLDTEST-PREP] Running test1"
mkdir -p $(TMPDIR) @rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in @mkdir -p $(TMPDIR)
-rm -f wrongtermsize @/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in
-rm -rf X* viminfo @rm -f wrongtermsize
@rm -rf X* viminfo
%.out: %.in .gdbinit %.out: %.in .gdbinit
-rm -rf $*.failed test.ok $(RM_ON_RUN) @echo "[OLDESTTEST] Running" $*
mkdir -p $(TMPDIR) @rm -rf $*.failed test.ok $(RM_ON_RUN)
cp $*.ok test.ok @mkdir -p $(TMPDIR)
/bin/sh runnvim.sh --oldesttest $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in @cp $*.ok test.ok
@/bin/sh runnvim.sh --oldesttest $(ROOT) $(NVIM_PRG) $* $(RUN_VIM) $*.in
-rm -rf X* test.ok viminfo @rm -rf X* test.ok viminfo
test49.out: test49.vim test49.out: test49.vim
nolog: 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 # New style of tests uses Vim script with assert calls. These are easier
@@ -225,5 +228,6 @@ newtests: newtestssilent
newtestssilent: $(NEW_TESTS) newtestssilent: $(NEW_TESTS)
%.res: %.vim .gdbinit %.res: %.vim .gdbinit
mkdir -p $(TMPDIR) @echo "[OLDTESTS] Running" $*
/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim @mkdir -p $(TMPDIR)
@/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim

15
src/nvim/testdir/runnvim.sh
View File

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