fix/bug-48598 96d2b054b3: [DEBUG] Try another quoting style for make params

[F. Jason Park]

branch: fix/bug-48598
commit 96d2b054b3621e07edeaada4d1636861d2ea4bba
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>

    [DEBUG] Try another quoting style for make params
---
 test/infra/gitlab-ci.yml | 42 ++++++++++++++++++------------------------
 test/infra/test-jobs.yml |  3 +--
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index c4cafc6962..f72806776f 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -87,7 +87,24 @@ default:
     # example shadowfile-tests, but passed without it.
     - 'export PWD=$(pwd)'
     - 'echo "DEBUG make_params: ${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 "echo DEBUG in 
container ${make_params} && make -n ${make_params} && git fetch ${PWD} HEAD && 
echo checking out these updated fi [...]
+    - >-
+      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} &&
+      make -n ${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}
+      "
   after_script:
     # - docker ps -a
     # - printenv
@@ -102,29 +119,6 @@ default:
 .build-template:
   needs: []
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "web"'
-      when: always
-    - changes:
-        - "**.in"
-        - GNUmakefile
-        - aclocal.m4
-        - autogen.sh
-        - configure.ac
-        - lib/*.{h,c}
-        - lib/malloc/*.{h,c}
-        - lisp/emacs-lisp/*.el
-        - src/*.{h,c}
-        - test/infra/*
-    - changes:
-        # gfilemonitor, kqueue
-        - src/gfilenotify.c
-        - src/kqueue.c
-        # MS Windows
-        - "**w32*"
-        # GNUstep
-        - lisp/term/ns-win.el
-        - src/ns*.{h,m}
-        - src/macfont.{h,m}
       when: never
   script:
     - docker build --pull --target ${target} -t 
${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} -f test/infra/Dockerfile.emba .
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index bf5ec12d23..960009f410 100644
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -220,8 +220,7 @@ test-lisp-erc-inotify:
         - test/lisp/erc/*resources/**
   variables:
     target: emacs-inotify
-    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