aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

runtime(syntax-tests): Re-introduce support for "phoney" languages

Browse Source 
As of patch v9.1.1176~1, there are no longer makeshift Make
targets to accommodate language names that can match phoney
targets.  For example, "clean_" was previously generated for
Clean because otherwise it clashed with the "clean" target.

Additionally, enable test filtering for makeshift targets.

Reference:
https://wiki.clean.cs.ru.nl/Clean

closes: #16810

Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Aliaksei Budavei 2025-03-07 19:12:45 +01:00 committed by Christian Brabandt
parent 53d59ecc1d
commit 6852e5c597
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
runtime/syntax/Makefile
View File

@ -26,6 +26,10 @@ RUN_VIMTEST = VIMRUNTIME=$(VIMRUNTIME) $(VALGRIND) $(ENVVARS) ../$(VIMPROG) -f $
# Uncomment this line for debugging # Uncomment this line for debugging
# DEBUGLOG = --log testlog # DEBUGLOG = --log testlog
# All initial phony targets; these names may clash with file types.
phonies = clean test testclean
.PHONY: $(phonies)
# Run the tests that didn't run yet or failed previously. # Run the tests that didn't run yet or failed previously.
# If a test succeeds a testdir/done/{name} file will be written. # If a test succeeds a testdir/done/{name} file will be written.
# If a test fails a testdir/failed/{name}.dump file will be written. # If a test fails a testdir/failed/{name}.dump file will be written.
@ -46,34 +50,28 @@ test:
# add dependence on syntax files # add dependence on syntax files
testdir/testdeps.mk: testdir/testdeps.mk:
./testdir/tools/maketestdeps > $@ ./testdir/tools/maketestdeps $(phonies) > $@
-include testdir/testdeps.mk -include testdir/testdeps.mk
clean testclean: clean testclean:
rm -f testdir/failed/* testdir/done/* testdir/vimcmd testdir/messages testdir/Xtestscript testdir/Xfilter testdir/testdeps.mk rm -f testdir/failed/* testdir/done/* testdir/vimcmd testdir/messages testdir/Xtestscript testdir/Xfilter testdir/testdeps.mk
# All initial phony targets; these names may clash with file extensions.
phonies = clean test testclean
.PHONY: $(phonies)
# Collect all input filenames and their file types. # Collect all input filenames and their file types.
testnames != set +f; \ testnames != set +f; \
awk 'BEGIN { \ awk 'BEGIN { \
for (i = 1; i < ARGC; i++) { \ for (i = 1; i < ARGC; i++) { \
name = ARGV[i]; \ split(ARGV[i], names, /\//); \
sub(/.+\//, "", name); \ split(names[3], parts, /[._]/); \
print name; \ types[parts[1]]; \
if (name ~ /.+_.+/) { \ print names[3]; \
sub(/_.+/, "", name); \ } \
} else { \ delete types["vim9"]; \
sub(/.+\./, "", name) \ split("$(phonies)", scratch); \
} \ for (phony in scratch) \
if (name == "vim9") name = "vim"; \ phonies[scratch[phony]]; \
exts[name]; \ for (type in types) \
} \ print type ((type in phonies) ? "_" : ""); \
for (ext in exts) \
print ext; \
}' testdir/input/*.* }' testdir/input/*.*
.PHONY: self-testing $(testnames) .PHONY: self-testing $(testnames)

2
runtime/syntax/testdir/runtest.vim
View File

@ -234,7 +234,7 @@ func RunTest()
" Turn a subset of filenames etc. requested for testing into a pattern. " Turn a subset of filenames etc. requested for testing into a pattern.
let filter = filereadable('../testdir/Xfilter') let filter = filereadable('../testdir/Xfilter')
\ ? readfile('../testdir/Xfilter') \ ? readfile('../testdir/Xfilter')
\ ->map({_, v -> (v =~ '\.' ? '^' : '\.') .. v .. '$'}) \ ->map({_, v -> '^' .. substitute(v, '_$', '', '')})
\ ->join('\|') \ ->join('\|')
\ : '' \ : ''