From fa9fc6b6a7bf6535e549c6ce9e5901389f30f111 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 15 Jul 2024 19:24:56 +0200
Subject: [PATCH] Adapt tressitter tests on EMBA

* test/infra/Makefile.in (TREE-SITTER-FILES): Simplify.

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

(cherry picked from commit 684e96a30d95b2ed5f2be6b85cfba3f8481707d1)
---
 test/infra/Makefile.in   | 8 +-------
 test/infra/test-jobs.yml | 3 +--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index 0144ad1cbd9..3e462add494 100644
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -117,12 +117,8 @@ endef
 
 $(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir))))
 
-# 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 "csharp-mode-tests.el" -o -name "js-tests.el" \
-	-o -name "python-tests.el" \) | \
+  find lisp src -name "*-tests.el" | xargs grep -El "treesit.*-p" | \
   sort | sed s/\\.el/.log/)
 
 all: generate-test-jobs
@@ -133,8 +129,6 @@ generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files
 
 tree-sitter-files:
 	@echo >>$(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)
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index 13b184b1277..180f29947ca 100644
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -577,11 +577,10 @@ test-src-inotify:
     target: emacs-inotify
     make_params: -C test check-src
 
-# 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/align-tests.log
       lisp/progmodes/csharp-mode-tests.log
       lisp/progmodes/c-ts-mode-tests.log
       lisp/progmodes/elixir-ts-mode-tests.log
-- 
2.39.5