[elpa] externals/hyperbole 67b3ab9f28 2/2: Makefile (test-all): Alwasy run GUI Emacs if DISPLAY is set

[ELPA Syncer]

branch: externals/hyperbole
commit 67b3ab9f2870eca44d19ea7bfc33e5ce0ec9df00
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Makefile (test-all): Alwasy run GUI Emacs if DISPLAY is set
---
 ChangeLog | 4 ++++
 Makefile  | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d2ccb4ee24..ba826d9738 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-01-23  Bob Weiner  <rsw@gnu.org>
+
+* Makefile (test-all): Add conditionals to always run GUI Emacs if DISPLAY is 
set.
+
 * hui.el (hui:gbut-create, hui:gibut-create): Move position of 'set-buffer' 
call after
     'hui:buf-writable-err' call so they do not interfere with each other, 
causing buttons
     to be written to the wrong buffer.
diff --git a/Makefile b/Makefile
index 1efa720c3f..e63783eff1 100644
--- a/Makefile
+++ b/Makefile
@@ -437,8 +437,15 @@ all-tests: test-all
 test-all:
        @echo "# Tests: $(TEST_ERT_FILES)"
 ifeq ($(TERM), dumb)
-       TERM=vt100 DISPLAY=$(DISPLAY) $(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))"
+ifneq (,$(findstring .apple.,$(DISPLAY)))
+        # Found, on MacOS, use graphical UI MacOS 'Emacs' script
+       TERM=xterm-256color EMACS=Emacs $(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))"
 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 ((auto-save-default)) 
$(LOAD_TEST_ERT_FILES) (ert-run-tests-interactively t))"
+endif
+else
+        # Typical case, run emacs normally
        $(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))"
 endif