Improve test runners

swift-emacs · Jul 9, 2022 · f09a19b · f09a19b
1 parent da673f9
commit f09a19b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/scripts/lint_in_docker.sh b/scripts/lint_in_docker.sh
@@ -9,10 +9,12 @@ do
         run \
         --rm \
         --volume="$(pwd)":/src \
-        --user "$(id -u):$(id -g)" \
+        --user="$(id -u):$(id -g)" \
+        --workdir="/src" \
+        --env=ELDEV_DIR=/src/.eldev \
+        --env=HOME=/tmp \
         silex/emacs:${version} \
-        bash -c \
-        "cd /src && ELDEV_DIR=/src/.eldev HOME=/tmp ./scripts/run_linter.sh" \
+        bash -c "/src/scripts/run_linter.sh" \
         || exit 1
 done
 

diff --git a/scripts/run_test.sh b/scripts/run_test.sh
@@ -11,5 +11,6 @@
 ./scripts/invoke_eldev.sh emacs --batch -q \
   --eval "(add-to-list 'load-path \"$(readlink -f .)\")" \
   --eval "(add-to-list 'load-path \"$(readlink -f .)/test\")" \
+  --eval "(setq debug-on-error t)" \
   -l test/swift-mode-test.el \
   -f swift-mode:run-test
diff --git a/scripts/test_in_docker.sh b/scripts/test_in_docker.sh
@@ -5,14 +5,17 @@
 for version in 28 27 26 25 24
 do
     rm -f *.elc
+    rm -f *-autoloads.el
     docker \
         run \
         --rm \
         --volume="$(pwd)":/src \
-        --user "$(id -u):$(id -g)" \
+        --user="$(id -u):$(id -g)" \
+        --workdir="/src" \
+        --env=ELDEV_DIR=/src/.eldev \
+        --env=HOME=/tmp \
         silex/emacs:${version} \
-        bash -c \
-        "cd /src && ELDEV_DIR=/src/.eldev HOME=/tmp ./scripts/run_test.sh" \
+        bash -c "/src/scripts/run_test.sh" \
         || exit 1
 done