[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 1fbcc8a 2/2: Merge branch 'emacs-25' of git.savan
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 1fbcc8a 2/2: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 |
Date: |
Fri, 05 Feb 2016 21:56:45 +0000 |
branch: emacs-25
commit 1fbcc8ad08cf94653f0e28b1e83c45f21c0f3ece
Merge: c1d32a6 1eaf68f
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
---
test/automated/file-notify-tests.el | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/automated/file-notify-tests.el
b/test/automated/file-notify-tests.el
index de64f50..629d85b 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -596,7 +596,7 @@ longer than timeout seconds for the events to be delivered."
(should (string-match "another text" (buffer-string)))
;; Stop file notification. Autorevert shall still work via
polling.
- ;; It doesn't work for `w32notify'.
+ ;; It doesn't work for w32notify.
(unless (string-equal (file-notify--test-library) "w32notify")
(file-notify-rm-watch auto-revert-notify-watch-descriptor)
(file-notify--wait-for-events
@@ -797,7 +797,10 @@ longer than timeout seconds for the events to be
delivered."
file-notify--test-tmpfile
'(change) 'file-notify--test-event-handler)))
(unwind-protect
- (let ((n 1000)
+ ;; In case of w32notify, the upper limit of events to handle
+ ;; seems to be 260. Reason unknown.
+ (let ((n (if (string-equal (file-notify--test-library) "w32notify")
+ 250 1000))
source-file-list target-file-list
(default-directory file-notify--test-tmpfile))
(dotimes (i n)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 1fbcc8a 2/2: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25,
Eli Zaretskii <=