Skip to content

Commit

Permalink
testing: Always show messages
Browse files Browse the repository at this point in the history
"messages" was shown only if it contained "SKIPPED" or "FAILED".
However, now "messages" contains information about execution time.
It is useful always to show "messages".

Also there was an issue in Make_dos.mak and Make_ming.mak.
If either "SKIPPED" or "FILED" was not found in "messages", `findstr`
returned 1, then the test was failed.
  • Loading branch information
k-takata committed Aug 26, 2020
1 parent 2e08661 commit 60d30f9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/testdir/Make_dos.mak
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
# Limitation: Only works with the +eval feature.

newtests: newtestssilent
@if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages
@if exist messages type messages

newtestssilent: $(NEW_TESTS_RES)

Expand Down
2 changes: 1 addition & 1 deletion src/testdir/Make_ming.mak
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ $(DOSTMP)/%.in : %.in
# Limitation: Only works with the +eval feature.

newtests: newtestssilent
@if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages
@if exist messages type messages

newtestssilent: $(NEW_TESTS_RES)

Expand Down
2 changes: 1 addition & 1 deletion src/testdir/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim

newtests: newtestssilent
@/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages; fi"
@/bin/sh -c "if test -f messages; then cat messages; fi"

newtestssilent: $(NEW_TESTS_RES)

Expand Down

0 comments on commit 60d30f9

Please sign in to comment.