From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 3 Jun 2023 16:32:29 +0000 (+0200)
Subject: Adapt emba integration
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6847c01568ef09764ee603fda5e20505453e1e10;p=emacs.git

Adapt emba integration

* test/infra/Dockerfile.emba (emacs-eglot, emacs-tree-sitter):
Don't install gawk.

* test/infra/gitlab-ci.yml (test-eglot): Add company and yasnippet.
---

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index 325cff6bd26..21b69dacacc 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -68,7 +68,7 @@ FROM debian:sid as emacs-eglot
 RUN apt-get update && \
     apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
       libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev \
-      libdbus-1-dev libacl1-dev acl git texinfo gawk gdb \
+      libdbus-1-dev libacl1-dev acl git texinfo gdb \
     && rm -rf /var/lib/apt/lists/*
 
 # Install clangd.
@@ -91,7 +91,7 @@ FROM debian:sid as emacs-tree-sitter
 RUN apt-get update && \
     apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
       libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev \
-      libdbus-1-dev libacl1-dev acl git texinfo gawk gdb \
+      libdbus-1-dev libacl1-dev acl git texinfo gdb \
     && rm -rf /var/lib/apt/lists/*
 
 # Install tree-sitter library.
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 4317cccf2a7..d5b18674c70 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -265,7 +265,14 @@ 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"'
+    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\)"'
 
 build-image-tree-sitter:
   stage: platform-images