Fix tree-sitter tests on emba

* 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.

diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index 057d44f653948ac556a6b90b38758849ac1500cc..5d40698541d6261fe778eef6edbc20a35561325f 100644 (file)
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -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
-
-generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template
+.PHONY: generate-test-jobs $(FILE) $(SUBDIR_TARGETS)
 
-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)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 213176bef7043c5d025a623eb38ba7d52003a292..ce2a92620fba59cd5b4ffb691d9d2ee61ce9ea67 100644 (file)
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -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

diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index 48c5b726f280ab0729a37138854d899eca14e81e..4e575d50e9af0d90b10c75bf0b03029f0a8e048b 100644 (file)
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -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"