[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
fix/bug-48598 6716cb34f2 2/3: Special-case ERC when generating CI test j
From: |
F. Jason Park |
Subject: |
fix/bug-48598 6716cb34f2 2/3: Special-case ERC when generating CI test jobs |
Date: |
Sat, 28 May 2022 18:23:23 -0400 (EDT) |
branch: fix/bug-48598
commit 6716cb34f2e105fa1f4dcf9d4692d882e74dc9fd
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>
Special-case ERC when generating CI test jobs
* test/infra/Makefile.in (subdir_template): Add special handling for
ERC to run expensive tests for routine pushes.
* test/infra/test-jobs.yml (test-lisp-erc-inotify): Copy generated
YAML from Makefile.
---
test/infra/Makefile.in | 13 ++++++++++---
test/infra/test-jobs.yml | 3 ++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index c251578e6a..89ba36e27f 100644
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -39,8 +39,12 @@ cps = $$$$CI_PIPELINE_SOURCE
define subdir_template
$(eval target = check-$(subst /,-,$(1)))
SUBDIR_TARGETS += $(target)
+ variables =
$(eval
+ define changes
+ @echo ' - $(1)/*.el' >>$(FILE)
+ endef
ifeq ($(findstring src, $(1)), src)
define changes
@echo ' - $(1)/*.{h,c}' >>$(FILE)
@@ -61,9 +65,11 @@ define subdir_template
define changes
@echo ' - admin/*.el' >>$(FILE)
endef
- else
- define changes
- @echo ' - $(1)/*.el' >>$(FILE)
+ else ifeq (lisp/erc,$(1))
+ define variables
+ @sed -i '$$$$$$$$d' $(FILE)
+ @printf ' make_params: >\n -k -C test SELECTOR=' >>$(FILE)
+ @printf '\x27\x24(SELECTOR_EXPENSIVE)\x27 %s\n' $(target) >>$(FILE)
endef
endif)
@@ -85,6 +91,7 @@ define subdir_template
@echo ' variables:' >>$(FILE)
@echo ' target: emacs-inotify' >>$(FILE)
@echo ' make_params: "-k -C test $(target)"' >>$(FILE)
+ $(variables)
endef
$(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir))))
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index 51707c181b..ed9cc40f46 100644
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -219,7 +219,8 @@ test-lisp-erc-inotify:
- test/lisp/erc/*resources/**
variables:
target: emacs-inotify
- make_params: "-k -C test check-lisp-erc"
+ make_params: >
+ -k -C test SELECTOR='$(SELECTOR_EXPENSIVE)' check-lisp-erc
test-lisp-eshell-inotify:
stage: normal