[DEBUG] Update ERC vanity case in CI subdir templatefix/bug-48598

These modifications to test/infra are not part of this patch set.

This branch exists for ironing out EMBA-specific wrinkles in ERC's
upcoming test suite.  See bug#48598 for the actual code.

3 files changed, 8 insertions, 9 deletions

diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index 89ba36e27fc..0e6b45332ac 100644
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -39,12 +39,14 @@ cps = $$$$CI_PIPELINE_SOURCE
 define subdir_template
   $(eval target = check-$(subst /,-,$(1)))
   SUBDIR_TARGETS += $(target)
-  variables =
 
   $(eval
     define changes
         @echo '        - $(1)/*.el' >>$(FILE)
     endef
+    define variables
+        @echo '    make_params: "-k -C test $(target)"' >>$(FILE)
+    endef
     ifeq ($(findstring src, $(1)), src)
     define changes
         @echo '        - $(1)/*.{h,c}' >>$(FILE)
@@ -67,9 +69,8 @@ define subdir_template
     endef
     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)
+        @printf '    make_params: "-k -C test SELECTOR=' >>$(FILE)
+        @printf '\x27\x24(SELECTOR_EXPENSIVE)\x27 %s"\n' $(target) >>$(FILE)
     endef
     endif)
 
@@ -90,7 +91,6 @@ define subdir_template
         @echo '        - test/$(1)/*resources/**' >>$(FILE)
         @echo '  variables:' >>$(FILE)
         @echo '    target: emacs-inotify' >>$(FILE)
-        @echo '    make_params: "-k -C test $(target)"' >>$(FILE)
         $(variables)
 endef
 
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 48f23821833..7dacbde9d46 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -86,11 +86,10 @@ default:
     # TODO: with make -j4 several of the tests were failing, for
     # example shadowfile-tests, but passed without it.
     - 'export PWD=$(pwd)'
-    - 'echo "DEBUG var_test: ${var_test}"'
     - 'echo "DEBUG make_params: ${make_params}"'
     - >-
       test "${make_params}" = "-k -C test SELECTOR='"'$(SELECTOR_EXPENSIVE)'"' check-lisp-erc"
-    - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} -e EMACS_TEST_JUNIT_REPORT=${EMACS_TEST_JUNIT_REPORT} -e EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} -e EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -c "echo DEBUG in container ${make_params} && git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j4 && make ${make_params}"'
+    - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} -e EMACS_TEST_JUNIT_REPORT=${EMACS_TEST_JUNIT_REPORT} -e EMACS_TEST_TIMEOUT=${EMACS_TEST_TIMEOUT} -e EMACS_TEST_VERBOSE=${EMACS_TEST_VERBOSE} --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -c "git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j4 && make ${make_params}"'
   after_script:
     # - docker ps -a
     # - printenv
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index 41b7a4951d6..8de5bd81f1e 100644
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -215,13 +215,13 @@ test-lisp-erc-inotify:
       when: never
     - changes:
         - test/infra/*
+        # ^ delete this
         - lisp/erc/*.el
         - test/lisp/erc/*.el
         - test/lisp/erc/*resources/**
   variables:
     target: emacs-inotify
-    var_test: "-k -C test SELECTOR='$(SELECTOR_EXPENSIVE)' check-lisp-erc"
-    make_params: "-k -C test SELECTOR='$$(SELECTOR_EXPENSIVE)' check-lisp-erc"
+    make_params: "-k -C test SELECTOR='$(SELECTOR_EXPENSIVE)' check-lisp-erc"
 
 test-lisp-eshell-inotify:
   stage: normal