diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-05-05 19:00:37 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-05-05 19:00:37 +0900 |
| commit | 5b97b98daa7f61311c3662beecbeca7037505992 (patch) | |
| tree | fc86c0a5fd61fdbd97451eae10ff081f2293eb86 /test/lisp/files-tests.el | |
| parent | 704b765eaaee82176e26ab084c26d65311fd46d3 (diff) | |
| parent | 58b0bcd16df83d914fe4d538e6be88cac9574906 (diff) | |
| download | emacs-5b97b98daa7f61311c3662beecbeca7037505992.tar.gz emacs-5b97b98daa7f61311c3662beecbeca7037505992.tar.bz2 emacs-5b97b98daa7f61311c3662beecbeca7037505992.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'test/lisp/files-tests.el')
| -rw-r--r-- | test/lisp/files-tests.el | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el index 33716577a1a..921e2c80f3a 100644 --- a/test/lisp/files-tests.el +++ b/test/lisp/files-tests.el @@ -302,12 +302,15 @@ be $HOME." (file-name-unquote temporary-file-directory)))))) (ert-deftest files-tests-file-name-non-special--subprocess () - "Check that Bug#25949 is fixed." - (skip-unless (executable-find "true")) - (let ((default-directory (file-name-quote temporary-file-directory))) - (should (zerop (process-file "true"))) - (should (processp (start-file-process "foo" nil "true"))) - (should (zerop (shell-command "true"))))) + "Check that Bug#25949 and Bug#48177 are fixed." + (skip-unless (and (executable-find "true") (file-exists-p null-device))) + (let ((default-directory (file-name-quote temporary-file-directory)) + (true (file-name-quote (executable-find "true"))) + (null (file-name-quote null-device))) + (should (zerop (process-file true null `((:file ,null) ,null)))) + (should (processp (start-file-process "foo" nil true))) + (should (zerop (shell-command true))) + (should (processp (make-process :name "foo" :command `(,true)))))) (defmacro files-tests--with-advice (symbol where function &rest body) (declare (indent 3)) @@ -715,9 +718,8 @@ unquoted file names." (file (file-name-nondirectory tmpfile)) (nospecial-file (file-name-nondirectory nospecial))) (should-not (string-equal file nospecial-file)) - (should-not (equal (file-name-all-completions - nospecial-file nospecial-tempdir) - (file-name-all-completions file tmpdir))) + (should (equal (file-name-all-completions nospecial-file nospecial-tempdir) + (file-name-all-completions file tmpdir))) (should (equal (file-name-all-completions file nospecial-tempdir) (file-name-all-completions file tmpdir))) (should (equal (file-name-all-completions nospecial-file tmpdir) @@ -759,8 +761,8 @@ unquoted file names." (file (file-name-nondirectory tmpfile)) (nospecial-file (file-name-nondirectory nospecial))) (should-not (string-equal file nospecial-file)) - (should-not (equal (file-name-completion nospecial-file nospecial-tempdir) - (file-name-completion file tmpdir))) + (should (equal (file-name-completion nospecial-file nospecial-tempdir) + (file-name-completion file tmpdir))) (should (equal (file-name-completion file nospecial-tempdir) (file-name-completion file tmpdir))) (should (equal (file-name-completion nospecial-file tmpdir) |