summaryrefslogtreecommitdiff
path: root/test/lisp/autorevert-tests.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2016-01-12 10:37:06 +0100
committerMichael Albinus <michael.albinus@gmx.de>2016-01-12 10:37:06 +0100
commit696f32c95c96f120ed1dc10193d27b7bc2adaba9 (patch)
treeb8421e99a43d4219ab03de421d90eb7b51d4c436 /test/lisp/autorevert-tests.el
parentc7bef6a4f033fa6b22906de0be6da54958d5b3c3 (diff)
downloademacs-696f32c95c96f120ed1dc10193d27b7bc2adaba9.tar.gz
Merge missing commit from emacs-25 branch
* test/Makefile.in (SELECTOR_DEFAULT, SELECTOR_EXPENSIVE, SELECTOR): New variables. (check-expensive, check-doit): New targets. * Makefile.in (check-expensive): New target. * test/lisp/autorevert-tests.el (auto-revert-test01-auto-revert-several-files): * test/lisp/filenotify-tests.el (file-notify--deftest-remote) (file-notify-test06-many-events): * test/lisp/net/tramp-tests.el (tramp-test26-process-file) (tramp-test27-start-file-process, tramp-test28-shell-command) (tramp-test29-vc-registered) (tramp-test31-special-characters-with-stat) (tramp-test31-special-characters-with-perl) (tramp-test31-special-characters-with-ls) (tramp-test32-utf8-with-stat, tramp-test32-utf8-with-perl) (tramp-test32-utf8-with-ls, tramp-test33-asynchronous-requests) (tramp-test35-unload): Tag the tests as :expensive-test.
Diffstat (limited to 'test/lisp/autorevert-tests.el')
-rw-r--r--test/lisp/autorevert-tests.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el
index b37850054fa..a6f8cb29563 100644
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -94,6 +94,7 @@
;; This is inspired by Bug#21841.
(ert-deftest auto-revert-test01-auto-revert-several-files ()
"Check autorevert for several files at once."
+ :tags '(:expensive-test)
(skip-unless (executable-find "cp"))
(let* ((cp (executable-find "cp"))
@@ -138,7 +139,7 @@
;; Strange, that `copy-directory' does not work as expected.
;; The following shell command is not portable on all
;; platforms, unfortunately.
- (shell-command (format "%s %s/* %s" cp tmpdir2 tmpdir1))
+ (shell-command (format "%s -f %s/* %s" cp tmpdir2 tmpdir1))
;; Check, that the buffers have been reverted.
(dolist (buf (list buf1 buf2))