feature/android d84cbcb8ce9 2/2: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit d84cbcb8ce970d8a54e164a5ef6f0074c0e59f91
Merge: f16a3f24408 f947a0219bb
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 test/infra/Makefile.in   | 13 ++-----------
 test/infra/gitlab-ci.yml | 12 ++++++++++--
 test/infra/test-jobs.yml | 11 -----------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index 057d44f6539..5d40698541d 100644
--- 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 213176bef70..ce2a92620fb 100644
--- 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 48c5b726f28..4e575d50e9a 100644
--- 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"