Make etags-tests work in out-of-tree builds

* test/lisp/progmodes/etags-tests.el (etags-bug-158)
(etags-bug-23164): Make them work in an out-of-tree build.
Reported by Ken Brown <kbrown@cornell.edu>.

diff --git a/test/lisp/progmodes/etags-tests.el b/test/lisp/progmodes/etags-tests.el
index a715bba32ab3a270e9a45b9cb3be8eb29c1ed1bb..a992a17dc4625c7d9387fb30e1640b16946f199c 100644 (file)
--- a/test/lisp/progmodes/etags-tests.el
+++ b/test/lisp/progmodes/etags-tests.el
@@ -37,7 +37,9 @@
         xref-buf)
     (set-buffer buf-with-global-tags)
     (setq default-directory (expand-file-name "."))
-    (visit-tags-table "./manual/etags/ETAGS.good_1")
+    (visit-tags-table
+     (expand-file-name "manual/etags/ETAGS.good_1"
+                       (getenv "EMACS_TEST_DIRECTORY")))
     ;; Check that tags in ETAGS.good_1 are recognized.
     (setq xref-buf (xref-find-definitions "LL_Task_Procedure_Access/t"))
     (should (bufferp xref-buf))
@@ -52,7 +54,10 @@
     (set-buffer buf-with-local-tags)
     (setq default-directory (expand-file-name "."))
     (let (his-masters-voice)
-      (visit-tags-table "./manual/etags/ETAGS.good_3" t))
+      (visit-tags-table
+       (expand-file-name "manual/etags/ETAGS.good_3"
+                         (getenv "EMACS_TEST_DIRECTORY"))
+       t))
     ;; Check that tags in ETAGS.good_1 are recognized.
     (setq xref-buf (xref-find-definitions "LL_Task_Procedure_Access/t"))
     (should (bufferp xref-buf))
@@ -78,6 +83,9 @@
   "Test that setting a local value of tags table doesn't signal errors."
   (set-buffer (get-buffer-create "*foobar*"))
   (fundamental-mode)
-  (visit-tags-table "./manual/etags/ETAGS.good_3" t)
+  (visit-tags-table
+   (expand-file-name "manual/etags/ETAGS.good_3"
+                     (getenv "EMACS_TEST_DIRECTORY"))
+   t)
   (should (equal (should-error (xref-find-definitions "foobar123"))
                  '(user-error "No definitions found for: foobar123"))))