fix/bug-48598 c7e729224e 2/2: [DEBUG] Try doubling dollar sign for make params

[F. Jason Park]

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

    [DEBUG] Try doubling dollar sign for make params
---
 test/infra/gitlab-ci.yml | 29 +++--------------------------
 test/infra/test-jobs.yml | 11 ++---------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index e6aa0d5233..48f2382183 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -86,34 +86,11 @@ 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_1: ${var_test_1}"'
-    - 'echo "DEBUG var_test_2: ${var_test_2}"'
-    - 'echo "DEBUG var_test_3: ${var_test_3}"'
-    - 'echo "DEBUG var_test_4: ${var_test_4}"'
-    - 'echo "DEBUG var_test_5: ${var_test_5}"'
-    - 'echo "DEBUG var_test_6: ${var_test_6}"'
-    - 'echo "DEBUG var_test_7: ${var_test_7}"'
+    - '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} &&
-      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}
-      "
+      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-onl [...]
   after_script:
     # - docker ps -a
     # - printenv
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index ef32c56f57..41b7a4951d 100644
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -220,15 +220,8 @@ test-lisp-erc-inotify:
         - test/lisp/erc/*resources/**
   variables:
     target: emacs-inotify
-    var_test_1: 'SELECTOR=$$(SELECTOR_EXPENSIVE)'
-    var_test_2: 'SELECTOR=\$(SELECTOR_EXPENSIVE)'
-    var_test_3: "SELECTOR='\\$(SELECTOR_EXPENSIVE)'"
-    var_test_4: "SELECTOR='$$(SELECTOR_EXPENSIVE)'"
-    var_test_5: 'SELECTOR=''$$(SELECTOR_EXPENSIVE)'''
-    # should be the same as 3
-    var_test_6: 'SELECTOR=''\$(SELECTOR_EXPENSIVE)'''
-    var_test_7: 'SELECTOR=''\$\(SELECTOR_EXPENSIVE\)'''
-    make_params: '-k -C test SELECTOR=\$\(SELECTOR_EXPENSIVE\) check-lisp-erc'
+    var_test: "-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