mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Use only posix options in a ediff-ptch test
* test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug26084): Use just "-b" patch option. Don't assume a particular suffix for the backup files.
This commit is contained in:
parent
5b264d8879
commit
9cf6a408c8
1 changed files with 15 additions and 10 deletions
|
|
@ -86,18 +86,23 @@ index 6a07f80..6e8e947 100644
|
|||
(point-max)
|
||||
ediff-patch-program
|
||||
nil nil nil
|
||||
"-f" "-z.orig" "-b"
|
||||
(cdr x))))
|
||||
"-b" (cdr x))))
|
||||
;; Check backup files were saved correctly.
|
||||
(dolist (x (list qux bar))
|
||||
(should-not (string= (with-temp-buffer
|
||||
(insert-file-contents x)
|
||||
(buffer-string))
|
||||
(with-temp-buffer
|
||||
(insert-file-contents (concat x ediff-backup-extension))
|
||||
(buffer-string))))))
|
||||
(delete-directory tmpdir 'recursive)
|
||||
(delete-file patch))))
|
||||
(let ((backup
|
||||
(car
|
||||
(directory-files
|
||||
tmpdir 'full
|
||||
(concat (file-name-nondirectory x) ".")))))
|
||||
(should-not
|
||||
(string= (with-temp-buffer
|
||||
(insert-file-contents x)
|
||||
(buffer-string))
|
||||
(with-temp-buffer
|
||||
(insert-file-contents backup)
|
||||
(buffer-string))))))
|
||||
(delete-directory tmpdir 'recursive)
|
||||
(delete-file patch)))))
|
||||
|
||||
|
||||
(provide 'ediff-ptch-tests)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue