From: Jens Schmidt <jschmidt4gnu@vodafonemail.de>
Date: Thu, 24 Apr 2025 21:32:45 +0000 (+0200)
Subject: ; Fix previous arc-mode-test commit
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fcd1eb33fcc46fd7ca7c78782b71624c4b8c91f;p=emacs.git

; Fix previous arc-mode-test commit

* test/lisp/arc-mode-tests.el (define-arc-mode-test-on-type): Doc fix.
("7z"): Use archiver executable "7z" on all ports.

(cherry picked from commit ec8075219da2e3cb676d89db58164f54b079b85d)
---

diff --git a/test/lisp/arc-mode-tests.el b/test/lisp/arc-mode-tests.el
index 51e8a5eba3f..dd8fdf9e0bc 100644
--- a/test/lisp/arc-mode-tests.el
+++ b/test/lisp/arc-mode-tests.el
@@ -79,7 +79,7 @@ Return a cons (ARC . EXIT-STATUS)."
   (cons arc (funcall (archive--act-files command files) arc)))
 
 (defmacro define-arc-mode-test-on-type (name command extension type)
-  "Define and execute a test that tests function `archive-find-type'.
+  "Define a test that tests function `archive-find-type'.
 Name the test based on NAME.  The generated test first calls
 
   (call-process (car COMMAND) nil nil nil
@@ -133,10 +133,9 @@ member MEMBER.  Then the test finds ARCHIVE and ensures that function
 
 (define-arc-mode-test-on-type "ar" '("ar" "q") "a" 'ar)
 
-(define-arc-mode-test-on-type "7z" (list (if (eq system-type 'windows-nt)
-                                             "7z" "7za")
-                                         "a")
-                              "7z" '7z)
+;; prefer executable "7z" to "7za", since the former seems be supported
+;; on a broader range of ports
+(define-arc-mode-test-on-type "7z" '("7z" "a") "7z" '7z)
 
 (ert-deftest arc-mode-test-zip-ensure-ext ()
   "Regression test for bug#61326."