Extend treesitter tests on emba

* test/infra/Dockerfile.emba (emacs-tree-sitter): Install c-ashrp
grammar.

* test/infra/Makefile.in (TREE-SITTER-FILES): Add csharp-mode-tests.el.
(tree-sitter-files): Rename from tree-sitter-files-template.
Generate .tree-sitter-files.

* test/infra/gitlab-ci.yml (test-tree-sitter): Extend .tree-sitter-files.

* test/infra/test-jobs.yml: Regenerate.

(cherry picked from commit ce4f56caf71b24ef005c832168f92bc72b532460)

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index 088df86ad700b8b9fe6c5bf374b7578b020d24c8..de32906212b8f7240a770ee505419c4e5888dfdb 100644 (file)
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -145,6 +145,7 @@ RUN src/emacs -Q --batch \
       treesit-language-source-alist \
       (quote ((bash "https://github.com/tree-sitter/tree-sitter-bash") \
       (c "https://github.com/tree-sitter/tree-sitter-c") \
+      (c-sharp "https://github.com/tree-sitter/tree-sitter-c-sharp") \
       (cpp "https://github.com/tree-sitter/tree-sitter-cpp") \
       (css "https://github.com/tree-sitter/tree-sitter-css") \
       (elixir "https://github.com/elixir-lang/tree-sitter-elixir") \

diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index 9c32fd6a192ba85cd4b239086cd66f9a132a7706..0144ad1cbd92b02473b580cec94e0183e5cb00fc 100644 (file)
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -117,22 +117,25 @@ endef
 
 $(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir))))
 
-# js-tests.el and python-tests.el don't follow test file name convention.
+# csharp-mode-tests.el, js-tests.el and python-tests.el don't follow
+# test file name convention.
 TREE-SITTER-FILES ?= $(shell cd .. ; \
   find lisp src \( -name "*-ts-mode-tests.el" -o -name "treesit-tests.el" \
-       -o -name "js-tests.el" -o -name "python-tests.el" \) | \
+       -o -name "csharp-mode-tests.el" -o -name "js-tests.el" \
+       -o -name "python-tests.el" \) | \
   sort | sed s/\\.el/.log/)
 
 all: generate-test-jobs
 
-.PHONY: generate-test-jobs $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template
+.PHONY: generate-test-jobs $(FILE) $(SUBDIR_TARGETS) tree-sitter-files
 
-generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template
+generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files
 
-tree-sitter-files-template:
+tree-sitter-files:
        @echo >>$(FILE)
-       @echo "# js-tests.el and python-tests.el don't follow test file name convention." >>$(FILE)
-       @echo '.tree-sitter-files-template:' >>$(FILE)
+       @echo "# csharp-mode-tests.el, js-tests.el and python-tests.el don't follow" >>$(FILE)
+       @echo "# test file name convention." >>$(FILE)
+       @echo '.tree-sitter-files:' >>$(FILE)
        @echo '  variables:' >>$(FILE)
        @echo '    tree_sitter_files: >-' >>$(FILE)
        @for name in $(TREE-SITTER-FILES) ; do echo "      $${name}" >>$(FILE) ; done

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 11ff0d1c738dd1fbf0f9690342a8a3a92e2e72b4..e5e48b76ec219ed26d401952ff84e5be1057ec52 100644 (file)
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -294,7 +294,7 @@ build-image-tree-sitter:
 
 test-tree-sitter:
   stage: platforms
-  extends: [.job-template, .test-template, .tree-sitter-template, .tree-sitter-files-template]
+  extends: [.job-template, .test-template, .tree-sitter-template, .tree-sitter-files]
   needs:
     - job: build-image-tree-sitter
       optional: true

diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index 0d9cbb029e540494a6b8de0bc5ad4d48023d134b..13b184b12774db1ea51b5142b74a066265c8d4a5 100644 (file)
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -577,10 +577,12 @@ test-src-inotify:
     target: emacs-inotify
     make_params: -C test check-src
 
-# js-tests.el and python-tests.el don't follow test file name convention.
-.tree-sitter-files-template:
+# csharp-mode-tests.el, js-tests.el and python-tests.el don't follow
+# test file name convention.
+.tree-sitter-files:
   variables:
     tree_sitter_files: >-
+      lisp/progmodes/csharp-mode-tests.log
       lisp/progmodes/c-ts-mode-tests.log
       lisp/progmodes/elixir-ts-mode-tests.log
       lisp/progmodes/go-ts-mode-tests.log