From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 19 Nov 2021 19:20:31 +0000 (+0100)
Subject: ; Fix emba scripts
X-Git-Tag: emacs-29.0.90~2852^2~185
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d9aa424f7de151627ed3efcf06162e968bf96f4;p=emacs.git

; Fix emba scripts
---

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index ac3989a5e49..abc7bddbf73 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -239,7 +239,8 @@ build-image-inotify:
 test-jobs-generator:
   stage: generator
   script:
-   - ./test-jobs-generator.sh > test-jobs.yml
+    - pwd
+    - test/infra/test-jobs-generator.sh > test-jobs.yml
   artifacts:
     paths:
       - test-jobs.yml
diff --git a/test/infra/test-jobs-generator.sh b/test/infra/test-jobs-generator.sh
index 97346785eaf..d5171acbf2c 100755
--- a/test/infra/test-jobs-generator.sh
+++ b/test/infra/test-jobs-generator.sh
@@ -26,52 +26,29 @@
 # Maintainer: Michael Albinus <michael.albinus@gmx.de>
 # URL: https://emba.gnu.org/emacs/emacs
 
-for target in $(cd ..; make -s subdir-targets); do
+SUBDIRS=$(cd test && \
+          (find lib-src lisp misc src -type d \
+           ! \( -path "*resources*" -o -path "*auto-save-list" \) \
+           -print | sort -))
+
+for subdir in $SUBDIRS; do
+    target=check-$(echo $subdir | tr '/' '-')
+
     case $target in
-        check-lib-src)
-            changes="
-        - lib-src/*.{h,c}
-        - test/lib-src/*.el"
-            ;;
-        check-lisp-emacs-lisp)
-            changes="
-        - lisp/emacs-lisp/*.el
-        - test/lisp/emacs-lisp/*.el"
-            ;;
-        check-lisp-emacs-lisp-eieio-tests)
-            changes="
-        - lisp/emacs-lisp/eieio-tests/*.el
-        - test/lisp/emacs-lisp/eieio-tests/*.el"
-            ;;
-        check-lisp-emacs-lisp-faceup-tests)
-            changes="
-        - lisp/emacs-lisp/faceup-tests/*.el
-        - test/lisp/emacs-lisp/faceup-tests/*.el"
-            ;;
-        check-lisp-mh-e)
+        check*-src)
             changes="
-        - lisp/mh-e/*.el
-        - test/lisp/mh-e/*.el"
-            ;;
-        check-lisp-so-long-tests)
-            changes="
-        - lisp/so-long-tests/*.el
-        - test/lisp/so-long-tests/*.el"
+        - $subdir/*.{h,c}
+        - test/$subdir/*.el"
             ;;
         check-misc)
             changes="
         - admin/*.el
-        - test/misc/*.el"
-            ;;
-        check-src)
-            changes="
-        - src/*.{h,c}
-        - test/src/*.el"
+        - test/$subdir/*.el"
             ;;
         *)
             changes="
-        - $(echo -n ${target##check-}/*.el | tr '-' '/')
-        - $(echo -n test${target##check}/*.el | tr '-' '/')"
+        - $subdir/*.el
+        - test/$subdir/*.el"
             ;;
     esac