From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 24 Nov 2021 13:47:55 +0000 (+0100)
Subject: ; Fix syntax error in generated test/infra/test-jobs.yml
X-Git-Tag: emacs-29.0.90~2852^2~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b2ba7da4f03100dd5b889104b5256f7b8ac7927;p=emacs.git

; Fix syntax error in generated test/infra/test-jobs.yml
---

diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index ae5a9fe50b6..e55a6edaff2 100644
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -34,6 +34,7 @@ SUBDIRS ?= $(shell make -s -C .. subdirs)
 SUBDIR_TARGETS =
 FILE = test-jobs.yml
 tn = $$$${test_name}
+cps = $$$$CI_PIPELINE_SOURCE
 
 define subdir_template
   $(eval target = check-$(subst /,-,$(1)))
@@ -72,7 +73,7 @@ define subdir_template
 	@echo '  stage: normal' >>$(FILE)
 	@echo '  extends: [.job-template, .test-template]' >>$(FILE)
 	@echo '  rules:' >>$(FILE)
-	@echo '    - if: $CI_PIPELINE_SOURCE == "schedule"' >>$(FILE)
+	@echo "    - if: '"'${cps} == "schedule"'"'" >>$(FILE)
 	@echo '      when: never' >>$(FILE)
 	@echo '    - changes:' >>$(FILE)
 	$(changes)
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index 93a409723d4..7af671d641b 100644
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -3,7 +3,7 @@ test-lib-src-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lib-src/*.{h,c}
@@ -24,7 +24,7 @@ test-lisp-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/*.el
@@ -45,7 +45,7 @@ test-lisp-calc-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/calc/*.el
@@ -66,7 +66,7 @@ test-lisp-calendar-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/calendar/*.el
@@ -87,7 +87,7 @@ test-lisp-cedet-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/cedet/*.el
@@ -108,7 +108,7 @@ test-lisp-cedet-semantic-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/cedet/semantic/*.el
@@ -129,7 +129,7 @@ test-lisp-cedet-semantic-bovine-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/cedet/semantic/bovine/*.el
@@ -150,7 +150,7 @@ test-lisp-cedet-srecode-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/cedet/srecode/*.el
@@ -171,7 +171,7 @@ test-lisp-emacs-lisp-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/emacs-lisp/*.el
@@ -192,7 +192,7 @@ test-lisp-emacs-lisp-eieio-tests-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/emacs-lisp/eieio*.el
@@ -213,7 +213,7 @@ test-lisp-emacs-lisp-faceup-tests-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/emacs-lisp/faceup*.el
@@ -234,7 +234,7 @@ test-lisp-emulation-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/emulation/*.el
@@ -255,7 +255,7 @@ test-lisp-erc-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/erc/*.el
@@ -276,7 +276,7 @@ test-lisp-eshell-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/eshell/*.el
@@ -297,7 +297,7 @@ test-lisp-gnus-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/gnus/*.el
@@ -318,7 +318,7 @@ test-lisp-image-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/image/*.el
@@ -339,7 +339,7 @@ test-lisp-international-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/international/*.el
@@ -360,7 +360,7 @@ test-lisp-mail-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/mail/*.el
@@ -381,7 +381,7 @@ test-lisp-mh-e-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/mh-e/*.el
@@ -402,7 +402,7 @@ test-lisp-net-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/net/*.el
@@ -423,7 +423,7 @@ test-lisp-nxml-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/nxml/*.el
@@ -444,7 +444,7 @@ test-lisp-obsolete-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/obsolete/*.el
@@ -465,7 +465,7 @@ test-lisp-org-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/org/*.el
@@ -486,7 +486,7 @@ test-lisp-play-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/play/*.el
@@ -507,7 +507,7 @@ test-lisp-progmodes-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/progmodes/*.el
@@ -528,7 +528,7 @@ test-lisp-so-long-tests-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/so-long*.el
@@ -549,7 +549,7 @@ test-lisp-term-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/term/*.el
@@ -570,7 +570,7 @@ test-lisp-textmodes-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/textmodes/*.el
@@ -591,7 +591,7 @@ test-lisp-url-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/url/*.el
@@ -612,7 +612,7 @@ test-lisp-vc-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - lisp/vc/*.el
@@ -633,7 +633,7 @@ test-misc-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - admin/*.el
@@ -654,7 +654,7 @@ test-src-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   rules:
-    - if: I_PIPELINE_SOURCE == "schedule"
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - changes:
         - src/*.{h,c}