mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix tree-sitter tests on emba

Browse source 
* test/infra/Makefile.in: Revert tree-sitter relevant changes.

* test/infra/gitlab-ci.yml (test-tree-sitter): Remove
.tree-sitter-files-template.  List files explicitly.

* test/infra/test-jobs.yml: Regenerate.
This commit is contained in:
Michael Albinus 2023-06-02 13:44:00 +02:00
parent 9f5ca95ef7
commit f947a0219b
3 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/infra/Makefile.in
View file

@ -100,20 +100,11 @@ endef
$(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir))))
TREE-SITTER-FILES ?= '"'$(shell cd .. ; find lisp -name "*-ts-*.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)
generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template
tree-sitter-files-template:
@echo >>$(FILE)
@echo '.tree-sitter-files-template:' >>$(FILE)
@echo ' variables:' >>$(FILE)
@echo ' tree-sitter-files: >-' >>$(FILE)
@for name in $(TREE-SITTER-FILES) ; do echo " $${name}" >>$(FILE) ; done
generate-test-jobs: $(FILE) $(SUBDIR_TARGETS)
$(FILE):
$(AM_V_GEN)

12
test/infra/gitlab-ci.yml
View file

@ -275,14 +275,22 @@ 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]
needs:
- job: build-image-tree-sitter
optional: true
variables:
target: emacs-tree-sitter
# This is needed in order to get a JUnit test report.
make_params: '-k -C test check-expensive LD_LIBRARY_PATH=/usr/local/lib/tree-sitter LOGFILES="$tree-sitter-files"'
files: >-
lisp/progmodes/c-ts-mode-tests.log
lisp/progmodes/elixir-ts-mode-tests.log
lisp/progmodes/go-ts-mode-tests.log
lisp/progmodes/heex-ts-mode-tests.log
lisp/progmodes/java-ts-mode-tests.log
lisp/progmodes/ruby-ts-mode-tests.log
lisp/progmodes/typescript-ts-mode-tests.log
make_params: '-k -C test check-expensive LD_LIBRARY_PATH=/usr/local/lib/tree-sitter LOGFILES="$files"'
build-image-gnustep:
stage: platform-images

11
test/infra/test-jobs.yml
View file

@ -567,14 +567,3 @@ test-src-inotify:
variables:
target: emacs-inotify
make_params: "-k -C test check-src"
.tree-sitter-files-template:
variables:
tree-sitter-files: >-
"lisp/progmodes/c-ts-mode-tests.log
lisp/progmodes/elixir-ts-mode-tests.log
lisp/progmodes/go-ts-mode-tests.log
lisp/progmodes/heex-ts-mode-tests.log
lisp/progmodes/java-ts-mode-tests.log
lisp/progmodes/ruby-ts-mode-tests.log
lisp/progmodes/typescript-ts-mode-tests.log"