From 075ab5ab3b8abc55baddce7105e22b6fa1b2e032 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Thu, 3 Oct 2024 16:38:52 +0200 Subject: [PATCH] patch 9.1.0757: tests: messages files contains ANSI escape sequences Problem: tests: messages files contains ANSI escape sequences Solution: filter those out in runtests.vim Also, since we are setting $LC_ALL, we don't need to set $LANG and $LANGUAGE since those are overridden by $LC_ALL anyhow. closes: #15788 Signed-off-by: Christian Brabandt --- src/testdir/Makefile | 2 +- src/testdir/runtest.vim | 4 ++-- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 7a4c4c484d..b6e8c80248 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -12,7 +12,7 @@ SCRIPTSOURCE = ../../runtime # Comment out this line to see the verbose output of tests. # # Catches SwapExists to avoid hanging at the ATTENTION prompt. -REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C LANG=C LANGUAGE=C awk '/Executing Test_/{match($$0, "([0-9][0-9]:[0-9][0-9] *)?Executing Test_[^\\)]*\\)"); print substr($$0, RSTART, RLENGTH) "\r"; fflush()}' +REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C awk '/Executing Test_/{match($$0, "([0-9][0-9]:[0-9][0-9] *)?Executing Test_[^\\)]*\\)"); print substr($$0, RSTART, RLENGTH) "\r"; fflush()}' # Uncomment this line to use valgrind for memory leaks and extra warnings. # The output goes into a file "valgrind.testN" diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 133993d4ff..7ac48455e8 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -522,11 +522,11 @@ func FinishTesting() " Add SKIPPED messages call extend(s:messages, s:skipped) - " Append messages to the file "messages" + " Append messages to the file "messages", but remove ANSI Escape sequences split messages call append(line('$'), '') call append(line('$'), 'From ' . g:testname . ':') - call append(line('$'), s:messages) + call append(line('$'), s:messages->map({_, val -> substitute(val, '\%x1b\[\d\?m', '', 'g')})) write qall! diff --git a/src/version.c b/src/version.c index 633c1e6d51..2f01df8c6e 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 757, /**/ 756, /**/