aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2023-09-14 14:38:27 +0200
committerMichael Albinus2023-09-14 14:38:27 +0200
commit2f2f934208c74560a42bd116a89a35164433ae52 (patch)
treee7d1479c48aba8a6a452eda873fa5abfbbfc398e
parent6ffb0a17199d70e5d4e5fc155897acf0ef2ccac6 (diff)
downloademacs-2f2f934208c74560a42bd116a89a35164433ae52.tar.gz
emacs-2f2f934208c74560a42bd116a89a35164433ae52.zip
Fix Tramp test on NetBSD
* test/lisp/net/tramp-tests.el (tramp--test-netbsd-p): New defun. (tramp--test-check-files): Use it.
-rw-r--r--test/lisp/net/tramp-tests.el15
1 files changed, 12 insertions, 3 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 50687dfe993..69d31a54644 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -7020,7 +7020,7 @@ This is used in tests which we don't want to tag
7020 (ert--stats-selector ert--current-run-stats) 7020 (ert--stats-selector ert--current-run-stats)
7021 (list (make-ert-test :name (ert-test-name (ert-running-test)) 7021 (list (make-ert-test :name (ert-test-name (ert-running-test))
7022 :body nil :tags '(:tramp-asynchronous-processes)))) 7022 :body nil :tags '(:tramp-asynchronous-processes))))
7023 ;; tramp-adb.el cannot apply multi-byte commands. 7023 ;; tramp-adb.el cannot apply multibyte commands.
7024 (not (and (tramp--test-adb-p) 7024 (not (and (tramp--test-adb-p)
7025 (string-match-p (rx multibyte) default-directory))))) 7025 (string-match-p (rx multibyte) default-directory)))))
7026 7026
@@ -7096,6 +7096,12 @@ This does not support external Emacs calls."
7096 (string-equal 7096 (string-equal
7097 "mock" (file-remote-p ert-remote-temporary-file-directory 'method))) 7097 "mock" (file-remote-p ert-remote-temporary-file-directory 'method)))
7098 7098
7099(defun tramp--test-netbsd-p ()
7100 "Check, whether the remote host runs NetBSD."
7101 ;; We must refill the cache. `file-truename' does it.
7102 (file-truename ert-remote-temporary-file-directory)
7103 (ignore-errors (tramp-check-remote-uname tramp-test-vec "NetBSD")))
7104
7099(defun tramp--test-openbsd-p () 7105(defun tramp--test-openbsd-p ()
7100 "Check, whether the remote host runs OpenBSD." 7106 "Check, whether the remote host runs OpenBSD."
7101 ;; We must refill the cache. `file-truename' does it. 7107 ;; We must refill the cache. `file-truename' does it.
@@ -7333,9 +7339,11 @@ This requires restrictions of file name syntax."
7333 7339
7334 ;; Check symlink in `directory-files-and-attributes'. 7340 ;; Check symlink in `directory-files-and-attributes'.
7335 ;; It does not work in the "smb" case, only relative 7341 ;; It does not work in the "smb" case, only relative
7336 ;; symlinks to existing files are shown there. 7342 ;; symlinks to existing files are shown there. On
7343 ;; NetBSD, there are problems with loooong file names,
7344 ;; see Bug#65324.
7337 (tramp--test-ignore-make-symbolic-link-error 7345 (tramp--test-ignore-make-symbolic-link-error
7338 (unless (tramp--test-smb-p) 7346 (unless (or (tramp--test-netbsd-p) (tramp--test-smb-p))
7339 (make-symbolic-link file2 file3) 7347 (make-symbolic-link file2 file3)
7340 (should (file-symlink-p file3)) 7348 (should (file-symlink-p file3))
7341 (should 7349 (should
@@ -8150,6 +8158,7 @@ If INTERACTIVE is non-nil, the tests are run interactively."
8150;; * tramp-set-file-uid-gid 8158;; * tramp-set-file-uid-gid
8151 8159
8152;; * Work on skipped tests. Make a comment, when it is impossible. 8160;; * Work on skipped tests. Make a comment, when it is impossible.
8161;; * Use `skip-when' starting with Emacs 30.1.
8153;; * Revisit expensive tests, once problems in `tramp-error' are solved. 8162;; * Revisit expensive tests, once problems in `tramp-error' are solved.
8154;; * Fix `tramp-test06-directory-file-name' for "ftp". 8163;; * Fix `tramp-test06-directory-file-name' for "ftp".
8155;; * Check, why a process filter t doesn't work in 8164;; * Check, why a process filter t doesn't work in