From: Tino Calancha <tino.calancha@gmail.com>
Date: Fri, 4 Aug 2017 13:35:29 +0000 (+0900)
Subject: Fix dired-test-bug27631 on MS-Windows
X-Git-Tag: emacs-26.0.90~517^2~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ae7dda5603c0191d62862b6c347b830f822af48;p=emacs.git

Fix dired-test-bug27631 on MS-Windows

Skip the test if Dired use 'ls' emulation with lisp.  The same
bug is tested in their respective test suites: ls-lisp-tests.el
and em-ls-tests.el.
* test/lisp/dired-tests.el (dired-test-bug27631): Skip test if 'ls-lisp'
or 'eshell' features are enabled.
---

diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el
index 02dbf263b9a..b14bbc63609 100644
--- a/test/lisp/dired-tests.el
+++ b/test/lisp/dired-tests.el
@@ -271,6 +271,10 @@
 
 (ert-deftest dired-test-bug27631 ()
   "Test for http://debbugs.gnu.org/27631 ."
+  ;; For dired using 'ls' emulation we test for this bug in
+  ;; ls-lisp-tests.el and em-ls-tests.el.
+  (skip-unless (and (not (featurep 'ls-lisp))
+                    (not (featurep 'eshell))))
   (let* ((dir (make-temp-file "bug27631" 'dir))
          (dir1 (expand-file-name "dir1" dir))
          (dir2 (expand-file-name "dir2" dir))