[elpa] externals/hyperbole da6fc8a1d5 08/11: Merge branch 'master' into use-29_4-in-the-workflow

[ELPA Syncer]

branch: externals/hyperbole
commit da6fc8a1d50963554a1e0348798a1ae5065712c2
Merge: f73bd9ecd0 079c10751a
Author: Robert Weiner <rsw@gnu.org>
Commit: GitHub <noreply@github.com>

    Merge branch 'master' into use-29_4-in-the-workflow
---
 ChangeLog |  3 +++
 Makefile  | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1e57fcd72..4512ff2978 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 * .github/workflows/main.yml (jobs): Use update 29 to 29.4 in CI workflow.
 
+* Makefile (HYPB_ERT_INTERACTIVE): New macro for supplying the test
+    specifier as given by the command line test to the all-tests target.
+
 2024-07-06  Bob Weiner  <rsw@gnu.org>
 
 * hibtypes.el (org-id): Fix bug in older versions of Org where where
diff --git a/Makefile b/Makefile
index e01dfefac8..c9a9e405c5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:      4-Jul-24 at 11:26:09 by Bob Weiner
+# Last-Mod:      7-Jul-24 at 22:21:42 by Mats Lidell
 #
 # Copyright (C) 1994-2023  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -504,8 +504,10 @@ LOAD_TEST_ERT_FILES=$(patsubst %,(load-file 
\"%\"),${TEST_ERT_FILES})
 # tests specified by the selector. See "(ert)test selectors"
 ifeq ($(origin test), command line)
 HYPB_ERT_BATCH = (ert-run-tests-batch-and-exit \"${test}\")
+HYPB_ERT_INTERACTIVE = (ert-run-tests-interactively \"${test}\")
 else
 HYPB_ERT_BATCH = (ert-run-tests-batch-and-exit)
+HYPB_ERT_INTERACTIVE = (ert-run-tests-interactively t)
 endif
 
 # For full backtrace run make test FULL_BT=<anything or even empty>
@@ -531,14 +533,14 @@ test-all:
 ifeq ($(TERM), dumb)
 ifneq (,$(findstring .apple.,$(DISPLAY)))
         # Found, on MacOS
-       TERM=xterm-256color $(EMACS) --quick $(PRELOADS) --eval "(load-file 
\"test/hy-test-dependencies.el\")" --eval "(let ((auto-save-default)) 
$(LOAD_TEST_ERT_FILES) (ert-run-tests-interactively t))"
+       TERM=xterm-256color $(EMACS) --quick $(PRELOADS) --eval "(load-file 
\"test/hy-test-dependencies.el\")" --eval "(let ((auto-save-default)) 
$(LOAD_TEST_ERT_FILES) $(HYPB_ERT_INTERACTIVE))"
 else
         # Not found, set TERM so tests will at least run within parent Emacs 
session
-       TERM=vt100 $(EMACS) --quick $(PRELOADS) --eval "(load-file 
\"test/hy-test-dependencies.el\")" --eval "(let ($(LET_VARIABLES)) 
$(LOAD_TEST_ERT_FILES) (ert-run-tests-interactively t))"
+       TERM=vt100 $(EMACS) --quick $(PRELOADS) --eval "(load-file 
\"test/hy-test-dependencies.el\")" --eval "(let ($(LET_VARIABLES)) 
$(LOAD_TEST_ERT_FILES) $(HYPB_ERT_INTERACTIVE))"
 endif
 else
         # Typical case, run emacs normally
-       $(EMACS) --quick $(PRELOADS) --eval "(load-file 
\"test/hy-test-dependencies.el\")" --eval "(let ($(LET_VARIABLES)) 
$(LOAD_TEST_ERT_FILES) (ert-run-tests-interactively t))"
+       $(EMACS) --quick $(PRELOADS) --eval "(load-file 
\"test/hy-test-dependencies.el\")" --eval "(let ($(LET_VARIABLES)) 
$(LOAD_TEST_ERT_FILES) $(HYPB_ERT_INTERACTIVE))"
 endif
 
 test-all-output: