runtime(syntax-tests): Re-introduce support for "phoney" languages
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>
diff --git a/runtime/syntax/Makefile b/runtime/syntax/Makefile
index 6d8019c..b081cde 100644
--- a/runtime/syntax/Makefile
+++ b/runtime/syntax/Makefile
@@ -26,6 +26,10 @@
# Uncomment this line for debugging
# 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.
# 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.
@@ -46,34 +50,28 @@
# add dependence on syntax files
testdir/testdeps.mk:
- ./testdir/tools/maketestdeps > $@
+ ./testdir/tools/maketestdeps $(phonies) > $@
-include testdir/testdeps.mk
clean testclean:
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.
testnames != set +f; \
awk 'BEGIN { \
- for (i = 1; i < ARGC; i++) { \
- name = ARGV[i]; \
- sub(/.+\//, "", name); \
- print name; \
- if (name ~ /.+_.+/) { \
- sub(/_.+/, "", name); \
- } else { \
- sub(/.+\./, "", name) \
- } \
- if (name == "vim9") name = "vim"; \
- exts[name]; \
- } \
- for (ext in exts) \
- print ext; \
+ for (i = 1; i < ARGC; i++) { \
+ split(ARGV[i], names, /\//); \
+ split(names[3], parts, /[._]/); \
+ types[parts[1]]; \
+ print names[3]; \
+ } \
+ delete types["vim9"]; \
+ split("$(phonies)", scratch); \
+ for (phony in scratch) \
+ phonies[scratch[phony]]; \
+ for (type in types) \
+ print type ((type in phonies) ? "_" : ""); \
}' testdir/input/*.*
.PHONY: self-testing $(testnames)
diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim
index 34b5cae..2dc78ec 100644
--- a/runtime/syntax/testdir/runtest.vim
+++ b/runtime/syntax/testdir/runtest.vim
@@ -234,7 +234,7 @@
" Turn a subset of filenames etc. requested for testing into a pattern.
let filter = filereadable('../testdir/Xfilter')
\ ? readfile('../testdir/Xfilter')
- \ ->map({_, v -> (v =~ '\.' ? '^' : '\.') .. v .. '$'})
+ \ ->map({_, v -> '^' .. substitute(v, '_$', '', '')})
\ ->join('\|')
\ : ''