[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 955e6a48fd 2/4: Merge branch 'master' of http
From: |
ELPA Syncer |
Subject: |
[elpa] externals/hyperbole 955e6a48fd 2/4: Merge branch 'master' of https://github.com/rswgnu/hyperbole |
Date: |
Sun, 16 Jan 2022 15:57:30 -0500 (EST) |
branch: externals/hyperbole
commit 955e6a48fd1ab8cc1c70b1204d59dad60ed8b6be
Merge: 7837f83da3 d971fd5e66
Author: Robert Weiner <rsw@gnu.org>
Commit: Robert Weiner <rsw@gnu.org>
Merge branch 'master' of https://github.com/rswgnu/hyperbole
---
ChangeLog | 6 ++++++
Makefile | 6 +++---
test/hbut-tests.el | 3 ++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3b833ddc8f..df0e3e3b8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-15 Mats Lidell <matsl@gnu.org>
+
+* Makefile (test-ert, test-all): Turn off auto-save.
+
+* test/hbut-tests.el (gbut-program-link-to-directory): Remove temp file.
+
2022-01-15 Bob Weiner <rsw@gnu.org>
* man/hyperbole.texi (Testing): Add to describe test usage.
diff --git a/Makefile b/Makefile
index b97c7b652d..d2dc7dfd16 100644
--- a/Makefile
+++ b/Makefile
@@ -409,15 +409,15 @@ LOAD_TEST_ERT_FILES=$(patsubst %,(load-file
\"%\"),${TEST_ERT_FILES})
test-ert:
@echo "# Tests: $(TEST_ERT_FILES)"
- $(EMACS_BATCH) --eval "(load-file \"test/hy-test-dependencies.el\")"
--eval "(progn $(LOAD_TEST_ERT_FILES) (ert-run-tests-batch-and-exit))"
+ $(EMACS_BATCH) --eval "(load-file \"test/hy-test-dependencies.el\")"
--eval "(let ((auto-save-default)) $(LOAD_TEST_ERT_FILES)
(ert-run-tests-batch-and-exit))"
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 "(progn
$(LOAD_TEST_ERT_FILES) (ert-run-tests-interactively t))"
+ 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))"
else
- $(EMACS) --quick $(PRELOADS) --eval "(load-file
\"test/hy-test-dependencies.el\")" --eval "(progn $(LOAD_TEST_ERT_FILES)
(ert-run-tests-interactively t))"
+ $(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
# Hyperbole install tests - Verify that hyperbole can be installed
diff --git a/test/hbut-tests.el b/test/hbut-tests.el
index 66fa4be15c..6170f4358b 100644
--- a/test/hbut-tests.el
+++ b/test/hbut-tests.el
@@ -98,7 +98,8 @@ Needed since hyperbole expands all links to absolute paths and
(with-current-buffer test-buffer
(should (eq (hattr:get (hbut:at-p) 'actype)
'actypes::link-to-directory))
(hbut-tests:should-match-tmp-folder (hattr:get (hbut:at-p) 'args))
- (should (equal (hattr:get (hbut:at-p) 'lbl-key) "global")))))))
+ (should (equal (hattr:get (hbut:at-p) 'lbl-key) "global"))))
+ (delete-file test-file))))
(ert-deftest hypb:program-create-ebut-in-buffer ()
"Create button with hypb:program in buffer."