diff options
| author | Tino Calancha <tino.calancha@gmail.com> | 2017-04-01 17:02:49 +0900 |
|---|---|---|
| committer | Tino Calancha <tino.calancha@gmail.com> | 2017-04-01 17:02:49 +0900 |
| commit | 9cf6a408c8f1678dc4a53f722aa1984c9489b4c2 (patch) | |
| tree | 66fe91e82f40785dcac73c34974e9a2cddf42e5d | |
| parent | 5b264d88792fec2a31a48c0de5ffe396c3c14604 (diff) | |
| download | emacs-9cf6a408c8f1678dc4a53f722aa1984c9489b4c2.tar.gz | |
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.
| -rw-r--r-- | test/lisp/vc/ediff-ptch-tests.el | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/test/lisp/vc/ediff-ptch-tests.el b/test/lisp/vc/ediff-ptch-tests.el index 7372a72021a..387786ced06 100644 --- a/test/lisp/vc/ediff-ptch-tests.el +++ b/test/lisp/vc/ediff-ptch-tests.el @@ -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) |