Improve treesitter tests on EMBA

* test/infra/Makefile.in (subdir_template):
* test/infra/gitlab-ci.yml (.tree-sitter-template): Check also
textmodes subdirectory for treesitter files.

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

(cherry picked from commit d844521abd586f7a42bf6f4f913d39e575f7a750)

diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index 77ab192121228d8bb789123b4f59e4423ce5f0e1..9c32fd6a192ba85cd4b239086cd66f9a132a7706 100644 (file)
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -76,6 +76,15 @@ define subdir_template
     define changes
        @echo '        - lisp/so-long*.el' >>$(FILE)
     endef
+    else ifeq ($(findstring textmodes, $(1)), textmodes)
+    define changes
+       @echo '        - $(1)/*-ts-mode.el' >>$(FILE)
+       @echo '        - test/$(1)/*-ts-mode-resources/**' >>$(FILE)
+       @echo '        - test/$(1)/*-ts-mode-tests.el' >>$(FILE)
+       @echo '      when: never' >>$(FILE)
+       @echo '    - changes:' >>$(FILE)
+       @echo '        - $(1)/*.el' >>$(FILE)
+    endef
     else ifeq ($(findstring misc, $(1)), misc)
     define changes
        @echo '        - admin/*.el' >>$(FILE)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 49e2118761df5126fab9de474b0d0abdaf775ee7..11ff0d1c738dd1fbf0f9690342a8a3a92e2e72b4 100644 (file)
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -186,12 +186,15 @@ default:
         - lisp/progmodes/*-ts-mode.el
         - lisp/progmodes/js.el
         - lisp/progmodes/python.el
+        - lisp/textmodes/*-ts-mode.el
         - src/treesit.{h,c}
         - test/infra/*
         - test/lisp/progmodes/*-ts-mode-resources/**
         - test/lisp/progmodes/*-ts-mode-tests.el
         - test/lisp/progmodes/js-tests.el
         - test/lisp/progmodes/python-tests.el
+        - test/lisp/textmodes/*-ts-mode-resources/**
+        - test/lisp/textmodes/*-ts-mode-tests.el
         - test/src/treesit-tests.el
 
 .native-comp-template:

diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index d9ba2363c9e0a1e437b4208c2c6304a6f359503a..0d9cbb029e540494a6b8de0bc5ad4d48023d134b 100644 (file)
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -475,6 +475,11 @@ test-lisp-textmodes-inotify:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
+    - changes:
+        - lisp/textmodes/*-ts-mode.el
+        - test/lisp/textmodes/*-ts-mode-resources/**
+        - test/lisp/textmodes/*-ts-mode-tests.el
+      when: never
     - changes:
         - lisp/textmodes/*.el
         - test/lisp/textmodes/*resources/**