branch: externals/hyperbole
commit f24b11df51c10790038bf54cfc8938cb63b9d583
Author: Bob Weiner <r...@gnu.org>
Commit: Bob Weiner <r...@gnu.org>
Include all test/*.el files and definitions in TAGS table
---
ChangeLog | 3 +++
Makefile | 4 ++--
test/hibtypes-tests.el | 10 +++++-----
test/hmouse-drv-tests.el | 10 +++++-----
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c8929528d2..81e55fd028 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2022-01-23 Bob Weiner <r...@gnu.org>
+* Makefile (TAGS): Include ert-deftest definitions in TAGS file.
+ (TEST_ERT_FILES): Add hy-test-*.el so indexed in TAGS file.
+
* hbut.el (gbut:label-p): Add to return global button label point is on if nay.
Use in 'hui:gbut-modify'.
diff --git a/Makefile b/Makefile
index 09004ab72f..993c0d5102 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ HYPERBOLE_FILES = dir info html $(EL_COMPILE) $(EL_KOTL) \
topwin.py hyperbole-banner.png $(man_dir)/hkey-help.txt \
$(man_dir)/hyperbole.texi $(man_dir)/hyperbole.css
$(man_dir)/version.texi
-TEST_ERT_FILES = $(wildcard test/*tests.el)
+TEST_ERT_FILES = $(wildcard test/*tests.el) $(wildcard test/hy-test-*.el)
EL_TAGS = $(EL_COMPILE) $(EL_KOTL) $(TEST_ERT_FILES)
@@ -315,7 +315,7 @@ bin-warn: src
tags: TAGS
TAGS: $(EL_TAGS)
- $(ETAGS) $(EL_TAGS)
+ $(ETAGS) --regex='/(ert-deftest[ \t]+\([^ \t\n\r\f()]+\) ?/' $(EL_TAGS)
clean:
$(RM) hyperbole-autoloads.el kotl/kotl-autoloads.el $(ELC_COMPILE)
$(ELC_KOTL) TAGS
diff --git a/test/hibtypes-tests.el b/test/hibtypes-tests.el
index 516d3fe9a3..7311e1ae87 100644
--- a/test/hibtypes-tests.el
+++ b/test/hibtypes-tests.el
@@ -131,11 +131,11 @@
"Pathname with line and position specification."
(unwind-protect
(with-temp-buffer
- (insert "\"${load-path}/hypb.el:10:5\"")
+ (insert "\"${load-path}/hypb.el:11:5\"")
(goto-char 2)
(ibtypes::pathname-line-and-column)
(should (string= "hypb.el" (buffer-name)))
- (should (= (line-number-at-pos) 10))
+ (should (= (line-number-at-pos) 11))
(should (= (current-column) 5)))
(kill-buffer "hypb.el")))
@@ -223,7 +223,7 @@
(ert-deftest ibtypes::ctags-vgrind-test ()
(unwind-protect
(with-temp-buffer
- (insert "hy-test-helpers:consume-input-events hy-test-helpers.el 22\n")
+ (insert "hy-test-helpers:consume-input-events hy-test-helpers.el 23\n")
(goto-char (point-min))
(forward-char 4)
(let ((default-directory (expand-file-name "test" hyperb:dir)))
@@ -238,8 +238,8 @@
(unwind-protect
(with-temp-buffer
(insert " \n")
- (insert "hy-test-helpers.el,103\n")
- (insert "(defun hy-test-helpers:consume-input-events 22,359\n")
+ (insert "hy-test-helpers.el,237\n")
+ (insert "(defun hy-test-helpers:consume-input-events 23,518\n")
(rename-buffer (concat "TAGS" (buffer-name)))
(goto-char (point-min))
(forward-line 2)
diff --git a/test/hmouse-drv-tests.el b/test/hmouse-drv-tests.el
index 57064d9881..e08bed9164 100644
--- a/test/hmouse-drv-tests.el
+++ b/test/hmouse-drv-tests.el
@@ -314,11 +314,11 @@
"Pathname with `load-path', line and position specification."
(unwind-protect
(with-temp-buffer
- (insert "\"${load-path}/hypb.el:10:5\"")
+ (insert "\"${load-path}/hypb.el:11:5\"")
(goto-char 2)
(action-key)
(should (string= "hypb.el" (buffer-name)))
- (should (= (line-number-at-pos) 10))
+ (should (= (line-number-at-pos) 11))
(should (= (current-column) 5)))
(kill-buffer "hypb.el")))
@@ -377,7 +377,7 @@
(ert-deftest hbut-ctags-vgrind-test ()
(unwind-protect
(with-temp-buffer
- (insert "hy-test-helpers:consume-input-events hy-test-helpers.el 22\n")
+ (insert "hy-test-helpers:consume-input-events hy-test-helpers.el 23\n")
(goto-char (point-min))
(forward-char 4)
(let ((default-directory (expand-file-name "test" hyperb:dir)))
@@ -392,8 +392,8 @@
(unwind-protect
(with-temp-buffer
(insert " \n")
- (insert "hy-test-helpers.el,103\n")
- (insert "(defun hy-test-helpers:consume-input-events 22,359\n")
+ (insert "hy-test-helpers.el,237\n")
+ (insert "(defun hy-test-helpers:consume-input-events 23,518\n")
(rename-buffer (concat "TAGS" (buffer-name)))
(goto-char (point-min))
(forward-line 2)
