mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 09:14:18 +00:00
ediff-mult-tests.el: remove temporary directory after test
* test/lisp/vc/ediff-mult-tests.el (ediff-test-bug3348): Clean up.
This commit is contained in:
parent
6dc2336a4f
commit
1396b373ff
1 changed files with 21 additions and 18 deletions
|
|
@ -27,28 +27,31 @@
|
|||
(let ((test-dir
|
||||
(expand-file-name "bug-3348-testdir" temporary-file-directory)))
|
||||
(make-directory test-dir t)
|
||||
(cd test-dir)
|
||||
(unwind-protect
|
||||
(progn
|
||||
(cd test-dir)
|
||||
|
||||
(make-directory "dir-a" t)
|
||||
(make-directory "dir-b" t)
|
||||
(make-directory "dir-a" t)
|
||||
(make-directory "dir-b" t)
|
||||
|
||||
(with-temp-file "dir-a/file"
|
||||
(insert "aaa\n"))
|
||||
(with-temp-file "dir-b/file"
|
||||
(insert "bbb\n"))
|
||||
(with-temp-file "dir-a/file"
|
||||
(insert "aaa\n"))
|
||||
(with-temp-file "dir-b/file"
|
||||
(insert "bbb\n"))
|
||||
|
||||
(ediff-directories "dir-a" "dir-b" nil)
|
||||
(switch-to-buffer "*Ediff Session Group Panel*")
|
||||
(ediff-directories "dir-a" "dir-b" nil)
|
||||
(switch-to-buffer "*Ediff Session Group Panel*")
|
||||
|
||||
(ediff-next-meta-item 1)
|
||||
(ediff-mark-for-operation-at-pos nil)
|
||||
(ediff-collect-custom-diffs)
|
||||
(ediff-next-meta-item 1)
|
||||
(ediff-mark-for-operation-at-pos nil)
|
||||
(ediff-collect-custom-diffs)
|
||||
|
||||
(with-current-buffer "*Ediff Multifile Diffs*"
|
||||
(write-file "foo.patch"))
|
||||
(with-current-buffer "*Ediff Multifile Diffs*"
|
||||
(write-file "foo.patch"))
|
||||
|
||||
(with-temp-file "dir-b/file"
|
||||
(insert "BBB\n"))
|
||||
(ediff-collect-custom-diffs)
|
||||
(with-temp-file "dir-b/file"
|
||||
(insert "BBB\n"))
|
||||
(ediff-collect-custom-diffs)
|
||||
|
||||
(should-not (equal ediff-meta-diff-buffer (get-buffer "foo.patch")))))
|
||||
(should-not (equal ediff-meta-diff-buffer (get-buffer "foo.patch"))))
|
||||
(delete-directory test-dir t))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue