]> git.eshelyaron.com Git - emacs.git/commitdiff
Adapt tressitter tests on EMBA
authorMichael Albinus <michael.albinus@gmx.de>
Mon, 15 Jul 2024 17:24:56 +0000 (19:24 +0200)
committerEshel Yaron <me@eshelyaron.com>
Wed, 17 Jul 2024 21:45:52 +0000 (23:45 +0200)
* test/infra/Makefile.in (TREE-SITTER-FILES): Simplify.

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

(cherry picked from commit 684e96a30d95b2ed5f2be6b85cfba3f8481707d1)

test/infra/Makefile.in
test/infra/test-jobs.yml

index 0144ad1cbd92b02473b580cec94e0183e5cb00fc..3e462add4949e1ec3c2fcbbda1dfb5e56129df03 100644 (file)
@@ -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)
index 13b184b12774db1ea51b5142b74a066265c8d4a5..180f29947caa6e54152853d7fcbad870d5c4a9c9 100644 (file)
@@ -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