Merge emacs-25 into master (using imerge)

[gnu-emacs] / test / lisp / autorevert-tests.el

diff --git a/test/automated/auto-revert-tests.el b/test/lisp/autorevert-tests.el
similarity index 99%
rename from test/automated/auto-revert-tests.el
rename to test/lisp/autorevert-tests.el
index e03ed8cb68777cb2a24c3c364d134605df1581ec..043f80de49e85d44b78e5790d78e3d6be4e88bad 100644 (file)
--- a/test/automated/auto-revert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -138,7 +138,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 -f %s/* %s" cp tmpdir2 tmpdir1))
+          (shell-command (format "%s %s/* %s" cp tmpdir2 tmpdir1))
 
           ;; Check, that the buffers have been reverted.
           (dolist (buf (list buf1 buf2))