Skip to content

Commit f0b8b2c

Browse files
zzzyxwvutchrisbra
zzzyxwvut
authored and
chrisbra
committed
Revert "CI: Manage multibyte characters in syntax tests"
This reverts commit 0fde6ae. With "v9.1.2134" applied, arbitrary multibyte characters are not replaced with spurious U+FFFD characters (typically when the host system is under load); U+FFFD characters that are intentionally written in an input file continue to remain present for later output and comparison. The workaround of "v9.1.1592~3" is no longer necessary. Also prefer "page_nr" to "nr" in syntax/testdir/runtest.vim closes: #19348 Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 35c428b commit f0b8b2c

4 files changed

Lines changed: 69 additions & 261 deletions

File tree

‎runtime/syntax/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ VIMRUNTIME = ../..
1313
# Uncomment this line to use valgrind for memory leaks and extra warnings.
1414
# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=45 --log-file=valgrind.$*
1515

16-
# Trace liveness on demand.
16+
# Trace ruler liveness on demand.
1717
# VIM_SYNTAX_TEST_LOG = `pwd`/testdir/failed/00-TRACE_LOG
1818

1919
# ENVVARS = LC_ALL=C VIM_SYNTAX_TEST_LOG="$(VIM_SYNTAX_TEST_LOG)"
@@ -39,7 +39,7 @@ test:
3939
@# the "vimcmd" file is used by the screendump utils
4040
@echo "../$(VIMPROG)" > testdir/vimcmd
4141
@echo "$(RUN_VIMTEST)" >> testdir/vimcmd
42-
@# Trace liveness on demand.
42+
@# Trace ruler liveness on demand.
4343
@#mkdir -p testdir/failed
4444
@#touch "$(VIM_SYNTAX_TEST_LOG)"
4545
VIMRUNTIME=$(VIMRUNTIME) $(ENVVARS) $(VIMPROG) --clean --not-a-term $(DEBUGLOG) -u testdir/runtest.vim > /dev/null

‎runtime/syntax/testdir/README.txt‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ an "input/setup/java.vim" script file with the following lines:
6161
Both inline setup commands and setup scripts may be used at the same time, the
6262
script file will be sourced before any VIM_TEST_SETUP commands are executed.
6363

64+
Every line of a source file must not be longer than 1425 (19 x 75) characters.
65+
6466
If there is no further setup required, you can now run all tests:
6567

6668
make test
@@ -110,20 +112,6 @@ If they look OK, move them to the "dumps" directory:
110112
If you now run the test again, it will succeed.
111113

112114

113-
Limitations for syntax plugin tests
114-
-----------------------------------
115-
116-
Do not compose ASCII lines that do not fit a 19 by 75 window (1425 columns).
117-
118-
Use multibyte characters, if at all, sparingly (see #16559). When possible,
119-
move multibyte characters closer to the end of a line and keep the line short:
120-
no more than a 75-byte total of displayed characters. A poorly rendered line
121-
may otherwise become wrapped when enough of spurious U+FFFD (0xEF 0xBF 0xBD)
122-
characters claim more columns than are available (75) and then invalidate line
123-
correspondence under test. Refrain from mixing non-spurious U+FFFD characters
124-
with other multibyte characters in the same line.
125-
126-
127115
Adjusting a syntax plugin test
128116
------------------------------
129117

0 commit comments

Comments
 (0)