Adapt emba integration

* test/infra/Dockerfile.emba (emacs-tree-sitter):
Use "/root/.emacs.d/tree-sitter" instead of "/usr/local/lib/tree-sitter".

* test/infra/gitlab-ci.yml (.job-template): Run "/bin/bash -xvc".
(test-eglot): Revert last change, it doesn't work yet.
(test-tree-sitter): Set TEST_HOME instead of LD_LIBRARY_PATH.

2 files changed, 6 insertions, 13 deletions

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index 21b69dacacc..4a3138fe685 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -107,12 +107,12 @@ RUN ./configure --with-tree-sitter
 RUN make bootstrap
 
 # Install language grammars.
-RUN mkdir /usr/local/lib/tree-sitter
+RUN mkdir -p /root/.emacs.d/tree-sitter
 RUN git config --global http.sslverify "false"
 # See https://github.com/emacs-tree-sitter/tree-sitter-langs/tree/master/repos
 RUN src/emacs -Q --batch \
     --eval '(setq \
-      treesit-extra-load-path (list "/usr/local/lib/tree-sitter") \
+      treesit-extra-load-path (list "/root/.emacs.d/tree-sitter") \
       treesit-language-source-alist \
       (quote ((c "https://github.com/tree-sitter/tree-sitter-c") \
       (cpp "https://github.com/tree-sitter/tree-sitter-cpp") \
@@ -125,7 +125,7 @@ RUN src/emacs -Q --batch \
       (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") \
       (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src"))))' \
     --eval '(dolist (lang (mapcar (quote car) treesit-language-source-alist)) \
-      (treesit-install-language-grammar lang "/usr/local/lib/tree-sitter"))'
+      (treesit-install-language-grammar lang "/root/.emacs.d/tree-sitter"))'
 
 FROM emacs-base as emacs-gnustep
 
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index d5b18674c70..6884c32848e 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -86,7 +86,7 @@ default:
     # TODO: with make -j4 several of the tests were failing, for
     # example shadowfile-tests, but passed without it.
     - 'export PWD=$(pwd)'
-    - '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}"'
+    - '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 -xvc "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
@@ -265,14 +265,7 @@ test-eglot:
   variables:
     target: emacs-eglot
     # This is needed in order to get a JUnit test report.
-    make_params: >-
-      '-k -C test check-expensive
-        LOGFILES="lisp/progmodes/eglot-tests.log"
-        TEST_HOME="/tmp"
-        EMACS_EXTRAOPT="--eval \(package-reinstall\ \(quote\ company\)\)
-                        --eval \(package-reinstall\ \(quote\ yasnippet\)\)
-                        --eval \(use-package\ company\)
-                        --eval \(use-package\ yasnippet\)"'
+    make_params: '-k -C test check-expensive LOGFILES="lisp/progmodes/eglot-tests.log"'
 
 build-image-tree-sitter:
   stage: platform-images
@@ -289,7 +282,7 @@ test-tree-sitter:
   variables:
     target: emacs-tree-sitter
     # This is needed in order to get a JUnit test report.
-    make_params: '-k -C test check-expensive LD_LIBRARY_PATH=/usr/local/lib/tree-sitter LOGFILES="$tree_sitter_files"'
+    make_params: '-k -C test check-expensive TEST_HOME=/root LOGFILES="$tree_sitter_files"'
 
 build-image-gnustep:
   stage: platform-images