[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f1fd3d26062: Adapt emba integration
From: |
Michael Albinus |
Subject: |
master f1fd3d26062: Adapt emba integration |
Date: |
Sat, 3 Jun 2023 04:19:17 -0400 (EDT) |
branch: master
commit f1fd3d2606220ee55046e0adb0cc0688c7327c14
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Adapt emba integration
* admin/notes/emba: Improve docker call.
* test/infra/Dockerfile.emba (emacs-eglot, emacs-tree-sitter):
Install also gawk.
* test/infra/Makefile.in (TREE-SITTER-FILES): New variable.
(tree-sitter-files-template): New rule.
(.PHONY, generate-test-jobs): Add it to dependencies.
* test/infra/gitlab-ci.yml (variables): Disable CI_DEBUG_TRACE.
(test-tree-sitter): Extends also .tree-sitter-files-template. Use
$tree_sitter_files.
* test/infra/test-jobs.yml: Regenerate.
---
admin/notes/emba | 7 +++----
test/infra/Dockerfile.emba | 4 ++--
test/infra/Makefile.in | 13 +++++++++++--
test/infra/gitlab-ci.yml | 14 +++-----------
test/infra/test-jobs.yml | 11 +++++++++++
5 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/admin/notes/emba b/admin/notes/emba
index 1f87a99ddc0..cad7a2e121c 100644
--- a/admin/notes/emba
+++ b/admin/notes/emba
@@ -107,12 +107,11 @@ via "make bootstrap". In order to use the image, start a
container
like
docker run --interactive --tty --env EMACS_EMBA_CI=1 --name emacs-inotify \
- emacs-inotify /bin/sh -i
+ emacs-inotify /bin/bash -i
-In this container, change the current directory to "/checkout". Now
-you can apply all commands known for Emacs, like
+In this container, your working directory is "/checkout". Now you can
+apply all commands known for Emacs, like
- cd /checkout
make -C test files-tests.log
While this container runs, you can also access its filesystem from
diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index 1969afdd333..c2e3afadb05 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 gdb \
+ libdbus-1-dev libacl1-dev acl git texinfo gawk 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 gdb \
+ libdbus-1-dev libacl1-dev acl git texinfo gawk gdb \
&& rm -rf /var/lib/apt/lists/*
# Install tree-sitter library.
diff --git a/test/infra/Makefile.in b/test/infra/Makefile.in
index 5d40698541d..1af13a0096a 100644
--- a/test/infra/Makefile.in
+++ b/test/infra/Makefile.in
@@ -100,11 +100,20 @@ endef
$(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir))))
+TREE-SITTER-FILES ?= $(shell cd .. ; find lisp -name "*-ts-mode-tests.el" |
sort | sed s/\\.el/.log/)
+
all: generate-test-jobs
-.PHONY: generate-test-jobs $(FILE) $(SUBDIR_TARGETS)
+.PHONY: generate-test-jobs $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template
+
+generate-test-jobs: $(FILE) $(SUBDIR_TARGETS) tree-sitter-files-template
-generate-test-jobs: $(FILE) $(SUBDIR_TARGETS)
+tree-sitter-files-template:
+ @echo >>$(FILE)
+ @echo '.tree-sitter-files-template:' >>$(FILE)
+ @echo ' variables:' >>$(FILE)
+ @echo ' tree_sitter_files: >-' >>$(FILE)
+ @for name in $(TREE-SITTER-FILES) ; do echo " $${name}" >>$(FILE)
; done
$(FILE):
$(AM_V_GEN)
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index ce2a92620fb..4317cccf2a7 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -58,7 +58,7 @@ variables:
# across multiple builds.
BUILD_TAG: ${CI_COMMIT_REF_SLUG}
# Disable if you don't need it, it can be a security risk.
- CI_DEBUG_TRACE: "true"
+ # CI_DEBUG_TRACE: "true"
default:
image: docker:19.03.12
@@ -275,22 +275,14 @@ build-image-tree-sitter:
test-tree-sitter:
stage: platforms
- extends: [.job-template, .test-template, .tree-sitter-template]
+ extends: [.job-template, .test-template, .tree-sitter-template,
.tree-sitter-files-template]
needs:
- job: build-image-tree-sitter
optional: true
variables:
target: emacs-tree-sitter
# This is needed in order to get a JUnit test report.
- files: >-
- lisp/progmodes/c-ts-mode-tests.log
- lisp/progmodes/elixir-ts-mode-tests.log
- lisp/progmodes/go-ts-mode-tests.log
- lisp/progmodes/heex-ts-mode-tests.log
- lisp/progmodes/java-ts-mode-tests.log
- lisp/progmodes/ruby-ts-mode-tests.log
- lisp/progmodes/typescript-ts-mode-tests.log
- make_params: '-k -C test check-expensive
LD_LIBRARY_PATH=/usr/local/lib/tree-sitter LOGFILES="$files"'
+ make_params: '-k -C test check-expensive
LD_LIBRARY_PATH=/usr/local/lib/tree-sitter LOGFILES="$tree_sitter_files"'
build-image-gnustep:
stage: platform-images
diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index 4e575d50e9a..21c19c3043e 100644
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -567,3 +567,14 @@ test-src-inotify:
variables:
target: emacs-inotify
make_params: "-k -C test check-src"
+
+.tree-sitter-files-template:
+ variables:
+ tree_sitter_files: >-
+ lisp/progmodes/c-ts-mode-tests.log
+ lisp/progmodes/elixir-ts-mode-tests.log
+ lisp/progmodes/go-ts-mode-tests.log
+ lisp/progmodes/heex-ts-mode-tests.log
+ lisp/progmodes/java-ts-mode-tests.log
+ lisp/progmodes/ruby-ts-mode-tests.log
+ lisp/progmodes/typescript-ts-mode-tests.log
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master f1fd3d26062: Adapt emba integration,
Michael Albinus <=