From 5ebed5219d32cc71ecc5f1b176fca960aa77e2bb Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 4 Sep 2026 17:50:44 +0200
Subject: [PATCH] Adapt eglot tests on emba

* test/infra/Dockerfile.emba (emacs-eglot): Install rust-src.

* test/infra/gitlab-ci.yml (test-eglot): Extend EMACS_EXTRAOPT.

* test/lisp/progmodes/eglot-tests.el
(eglot-test-rust-completion-exit-function): Don't skip on emba.
---
 test/infra/Dockerfile.emba         | 2 +-
 test/infra/gitlab-ci.yml           | 2 +-
 test/lisp/progmodes/eglot-tests.el | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index f96ebc0adeb..5c8bbdb1e90 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -71,7 +71,7 @@ RUN apt-get update && \
 # Install clangd, tsserver, rust-analyzer.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
-      clangd npm node-typescript pipx rust-analyzer cargo \
+      clangd npm node-typescript pipx rust-analyzer cargo rust-src \
     && rm -rf /var/lib/apt/lists/*
 
 RUN npm install -g typescript-language-server
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index c9f7bf92ca7..e22b2e52801 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -327,7 +327,7 @@ test-eglot:
       check-expensive
       TEST_HOME=/root
       LOGFILES="lisp/progmodes/eglot-tests.log"
-      EMACS_EXTRAOPT='--eval \(package-install\ \(quote\ company\)\) --eval \(package-install\ \(quote\ yasnippet\)\) --eval \(setopt\ package-selected-packages\ \(quote\ \(company\ yasnippet\)\)\) --eval \(setq\ exec-path\ \(cons\ \"/root/.local/bin\"\ exec-path\)\)'
+      EMACS_EXTRAOPT='--eval \(package-install\ \(quote\ company\)\) --eval \(package-install\ \(quote\ yasnippet\)\) --eval \(setopt\ package-selected-packages\ \(quote\ \(company\ yasnippet\)\)\) --eval \(setq\ exec-path\ \(cons\ \"/root/.local/bin\"\ exec-path\)\) --eval \(setenv\ \"PATH\"\ \(concat\ \(getenv\ \"PATH\"\)\ \":/root/.local/bin\"\)\)'
 
 build-image-tree-sitter:
   stage: platform-images
diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el
index 79132d7f3f5..9312d268df0 100644
--- a/test/lisp/progmodes/eglot-tests.el
+++ b/test/lisp/progmodes/eglot-tests.el
@@ -776,7 +776,6 @@ directory hierarchy."
   ;; This originally appeared in github#1339
   (skip-unless (executable-find "rust-analyzer"))
   (skip-unless (executable-find "cargo"))
-  (skip-unless (not (getenv "EMACS_EMBA_CI")))
   (eglot--with-fixture
       '(("cmpl-project" .
          (("main.rs" .