From 031d6321885c15c054d28e3a434de743c1b3193d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 22 Jun 2023 22:38:54 +0100 Subject: patch 9.0.1648: result of syntax tests is hard to see Problem: Result of syntax tests is hard to see. Solution: List the failed tests. --- runtime/syntax/Makefile | 2 +- runtime/syntax/testdir/runtest.vim | 17 ++++++++++------- src/version.c | 2 ++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/runtime/syntax/Makefile b/runtime/syntax/Makefile index 08bc824fc1..a52c7d616e 100644 --- a/runtime/syntax/Makefile +++ b/runtime/syntax/Makefile @@ -26,7 +26,7 @@ test: @echo "../$(VIMPROG)" > testdir/vimcmd @echo "$(RUN_VIMTEST)" >> testdir/vimcmd VIMRUNTIME=$(VIMRUNTIME) $(VIMPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.vim - @tail -n 5 testdir/messages + @tail -n 6 testdir/messages clean testclean: diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim index 21e1ae352a..9e2739f0ae 100644 --- a/runtime/syntax/testdir/runtest.vim +++ b/runtime/syntax/testdir/runtest.vim @@ -40,7 +40,8 @@ endfunc exe 'split ' .. s:messagesFname call append(line('$'), repeat('=-', 70)) call append(line('$'), '') -call append(line('$'), 'Test run on ' .. strftime("%Y %b %d %H:%M:%S")) +let s:test_run_message = 'Test run on ' .. strftime("%Y %b %d %H:%M:%S") +call append(line('$'), s:test_run_message) wq if syntaxDir !~ '[/\\]runtime[/\\]syntax\>' @@ -86,7 +87,7 @@ endfunc let ok_count = 0 -let failed_count = 0 +let failed_tests = [] let skipped_count = 0 let MAX_FAILED_COUNT = 5 for fname in glob('input/*.*', 1, 1) @@ -162,20 +163,21 @@ for fname in glob('input/*.*', 1, 1) call delete('done/' .. root) - let failed_count += 1 - if failed_count > MAX_FAILED_COUNT + call failed_tests->extend(root) + if len(failed_tests) > MAX_FAILED_COUNT call Message('') call Message('Too many errors, aborting') endif endif else + call Message("Test " .. root .. " skipped") let skipped_count += 1 endif " Append messages to the file "testdir/messages" call AppendMessages('Input file ' .. fname .. ':') - if failed_count > MAX_FAILED_COUNT + if len(failed_tests) > MAX_FAILED_COUNT break endif endfor @@ -183,12 +185,13 @@ endfor " Matching "if 1" at the start. endif +call Message(s:test_run_message) call Message('OK: ' .. ok_count) -call Message('FAILED: ' .. failed_count) +call Message('FAILED: ' .. len(failed_tests) .. ': ' .. string(failed_tests)) call Message('skipped: ' .. skipped_count) call AppendMessages('== SUMMARY ==') -if failed_count > 0 +if len(failed_tests) > 0 " have make report an error cquit endif diff --git a/src/version.c b/src/version.c index b027efd2df..191bf506cf 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1648, /**/ 1647, /**/ -- cgit v1.2.3