From: Tino Calancha <tino.calancha@gmail.com>
Date: Sat, 1 Apr 2017 08:02:49 +0000 (+0900)
Subject: Use only posix options in a ediff-ptch test
X-Git-Tag: emacs-26.0.90~522^2~4^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9cf6a408c8f1678dc4a53f722aa1984c9489b4c2;p=emacs.git

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.
---

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)