diff options
| author | Michael Albinus | 2024-06-24 20:02:07 +0200 |
|---|---|---|
| committer | Michael Albinus | 2024-06-24 20:02:07 +0200 |
| commit | ce4f56caf71b24ef005c832168f92bc72b532460 (patch) | |
| tree | be7b6557b4a1d8dddf231226c21e4d24909a5476 | |
| parent | 7e8a97ac7885c1f0818a713e98bedd558293bb39 (diff) | |
| download | emacs-ce4f56caf71b24ef005c832168f92bc72b532460.tar.gz emacs-ce4f56caf71b24ef005c832168f92bc72b532460.zip | |
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.
| -rw-r--r-- | test/infra/Dockerfile.emba | 1 | ||||
| -rw-r--r-- | test/infra/Makefile.in | 17 | ||||
| -rw-r--r-- | test/infra/gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | test/infra/test-jobs.yml | 6 |
4 files changed, 16 insertions, 10 deletions
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba index 088df86ad70..de32906212b 100644 --- a/test/infra/Dockerfile.emba +++ b/test/infra/Dockerfile.emba | |||
| @@ -145,6 +145,7 @@ RUN src/emacs -Q --batch \ | |||
| 145 | treesit-language-source-alist \ | 145 | treesit-language-source-alist \ |
| 146 | (quote ((bash "https://github.com/tree-sitter/tree-sitter-bash") \ | 146 | (quote ((bash "https://github.com/tree-sitter/tree-sitter-bash") \ |
| 147 | (c "https://github.com/tree-sitter/tree-sitter-c") \ | 147 | (c "https://github.com/tree-sitter/tree-sitter-c") \ |
| 148 | (c-sharp "https://github.com/tree-sitter/tree-sitter-c-sharp") \ | ||
| 148 | (cpp "https://github.com/tree-sitter/tree-sitter-cpp") \ | 149 | (cpp "https://github.com/tree-sitter/tree-sitter-cpp") \ |
| 149 | (css "https://github.com/tree-sitter/tree-sitter-css") \ | 150 | (css "https://github.com/tree-sitter/tree-sitter-css") \ |
| 150 | (elixir "https://github.com/elixir-lang/tree-sitter-elixir") \ | 151 | (elixir "https://github.com/elixir-lang/tree-sitter-elixir") \ |
diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in index 9c32fd6a192..0144ad1cbd9 100644 --- a/test/infra/Makefile.in +++ b/test/infra/Makefile.in | |||
| @@ -117,22 +117,25 @@ endef | |||
| 117 | 117 | ||
| 118 | $(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir)))) | 118 | $(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir)))) |
| 119 | 119 | ||
| 120 | # js-tests.el and python-tests.el don't follow test file name convention. | 120 | # csharp-mode-tests.el, js-tests.el and python-tests.el don't follow |
| 121 | # test file name convention. | ||
| 121 | TREE-SITTER-FILES ?= $(shell cd .. ; \ | 122 | TREE-SITTER-FILES ?= $(shell cd .. ; \ |
| 122 | find lisp src \( -name "*-ts-mode-tests.el" -o -name "treesit-tests.el" \ | 123 | find lisp src \( -name "*-ts-mode-tests.el" -o -name "treesit-tests.el" \ |
| 123 | -o -name "js-tests.el" -o -name "python-tests.el" \) | \ | 124 | -o -name "csharp-mode-tests.el" -o -name "js-tests.el" \ |
| 125 | -o -name "python-tests.el" \) | \ | ||
| 124 | sort | sed s/\\.el/.log/) | 126 | sort | sed s/\\.el/.log/) |
| 125 | 127 | ||
| 126 | all: generate-test-jobs | 128 | all: generate-test-jobs |
| 127 | 129 | ||
| 128 | .PHONY: generate-test-jobs $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template | 130 | .PHONY: generate-test-jobs $(FILE) $(SUBDIR_TARGETS) tree-sitter-files |
| 129 | 131 | ||
| 130 | generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template | 132 | generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files |
| 131 | 133 | ||
| 132 | tree-sitter-files-template: | 134 | tree-sitter-files: |
| 133 | @echo >>$(FILE) | 135 | @echo >>$(FILE) |
| 134 | @echo "# js-tests.el and python-tests.el don't follow test file name convention." >>$(FILE) | 136 | @echo "# csharp-mode-tests.el, js-tests.el and python-tests.el don't follow" >>$(FILE) |
| 135 | @echo '.tree-sitter-files-template:' >>$(FILE) | 137 | @echo "# test file name convention." >>$(FILE) |
| 138 | @echo '.tree-sitter-files:' >>$(FILE) | ||
| 136 | @echo ' variables:' >>$(FILE) | 139 | @echo ' variables:' >>$(FILE) |
| 137 | @echo ' tree_sitter_files: >-' >>$(FILE) | 140 | @echo ' tree_sitter_files: >-' >>$(FILE) |
| 138 | @for name in $(TREE-SITTER-FILES) ; do echo " $${name}" >>$(FILE) ; done | 141 | @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 11ff0d1c738..e5e48b76ec2 100644 --- a/test/infra/gitlab-ci.yml +++ b/test/infra/gitlab-ci.yml | |||
| @@ -294,7 +294,7 @@ build-image-tree-sitter: | |||
| 294 | 294 | ||
| 295 | test-tree-sitter: | 295 | test-tree-sitter: |
| 296 | stage: platforms | 296 | stage: platforms |
| 297 | extends: [.job-template, .test-template, .tree-sitter-template, .tree-sitter-files-template] | 297 | extends: [.job-template, .test-template, .tree-sitter-template, .tree-sitter-files] |
| 298 | needs: | 298 | needs: |
| 299 | - job: build-image-tree-sitter | 299 | - job: build-image-tree-sitter |
| 300 | optional: true | 300 | optional: true |
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml index 0d9cbb029e5..13b184b1277 100644 --- a/test/infra/test-jobs.yml +++ b/test/infra/test-jobs.yml | |||
| @@ -577,10 +577,12 @@ test-src-inotify: | |||
| 577 | target: emacs-inotify | 577 | target: emacs-inotify |
| 578 | make_params: -C test check-src | 578 | make_params: -C test check-src |
| 579 | 579 | ||
| 580 | # js-tests.el and python-tests.el don't follow test file name convention. | 580 | # csharp-mode-tests.el, js-tests.el and python-tests.el don't follow |
| 581 | .tree-sitter-files-template: | 581 | # test file name convention. |
| 582 | .tree-sitter-files: | ||
| 582 | variables: | 583 | variables: |
| 583 | tree_sitter_files: >- | 584 | tree_sitter_files: >- |
| 585 | lisp/progmodes/csharp-mode-tests.log | ||
| 584 | lisp/progmodes/c-ts-mode-tests.log | 586 | lisp/progmodes/c-ts-mode-tests.log |
| 585 | lisp/progmodes/elixir-ts-mode-tests.log | 587 | lisp/progmodes/elixir-ts-mode-tests.log |
| 586 | lisp/progmodes/go-ts-mode-tests.log | 588 | lisp/progmodes/go-ts-mode-tests.log |