Merge branch 'dev-better-test'

Author: blahgeek

.github/workflows/_build-emacs.yml

@@ -94,13 +94,13 @@ jobs:
     - name: Test in ubuntu 20.04 container
       if: ${{ inputs.do_test }}
       run: |
-        docker run -v ./dist:/dist -v ./scripts:/scripts tester-image_ubuntu2004:latest \
+        docker run -v ./dist:/dist tester-image_ubuntu2004:latest \
           /scripts/test_emacs_in_docker.sh /dist/Emacs.AppImage
 
     - name: Test in archlinux container
       if: ${{ inputs.do_test }}
       run: |
-        docker run -v ./dist:/dist -v ./scripts:/scripts tester-image_archlinux:latest \
+        docker run -v ./dist:/dist tester-image_archlinux:latest \
           /scripts/test_emacs_in_docker.sh /dist/Emacs.AppImage
 
     - name: Upload binary as artifact

.github/workflows/_prepare-docker.yml

@@ -52,6 +52,7 @@ jobs:
     - name: Build and export
       uses: docker/build-push-action@v5
       with:
+        context: tests/
         file: tests/Dockerfile.ubuntu2004
         # cache-from: type=gha
         # cache-to: type=gha,mode=max
@@ -79,6 +80,7 @@ jobs:
     - name: Build and export
       uses: docker/build-push-action@v5
       with:
+        context: tests/
         file: tests/Dockerfile.archlinux
         # cache-from: type=gha
         # cache-to: type=gha,mode=max

tests/Dockerfile.archlinux

@@ -3,3 +3,5 @@ FROM archlinux:latest
 RUN pacman-key --init \
     && pacman -Syu --noconfirm \
     && pacman -S --noconfirm xfce4
+
+ADD scripts /scripts

tests/Dockerfile.ubuntu2004

@@ -3,3 +3,5 @@ FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y ubuntu-desktop
+
+ADD scripts /scripts

tests/scripts/test.el

@@ -0,0 +1,20 @@
+;;; test.el ---                                      -*- lexical-binding: t; -*-
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'cl-macs)
+
+(message "hello world!")
+
+(cl-assert (native-comp-available-p))
+(cl-assert (native-compile '(lambda (x) (* x 2))))
+
+(cl-assert (executable-find "emacsclient"))
+(cl-assert (executable-find "emacs"))
+(cl-assert (executable-find "hexl"))
+
+(cl-assert (file-exists-p (file-name-concat doc-directory "NEWS")))
+(cl-assert (file-exists-p (file-name-concat data-directory "charsets/GBK.map")))
+

scripts/test_emacs_in_docker.sh renamed to tests/scripts/test_emacs_in_docker.sh

@@ -1,17 +1,15 @@
 #!/bin/bash -ex
 
+SCRIPTS_DIR="$(realpath "$(dirname "$0")")"
 EMACS_APPIMAGE="$(realpath "$1")"
 
 cd "$(mktemp -d)"
 
 cp "$EMACS_APPIMAGE" ./Emacs.AppImage
 chmod +x ./Emacs.AppImage
 
-cat <<-EOF > test.el
-(native-compile '(lambda (x) (* x 2)))
-(message "hello world!")
-EOF
-
 ./Emacs.AppImage --appimage-extract
 cd squashfs-root
-./AppRun --batch -l ../test.el
+
+./AppRun --batch -l "$SCRIPTS_DIR/test.el"
+[[ "$(./AppRun --emacs-appimage-run-as emacsclient --version)" =~ emacsclient* ]]