Merge from origin/emacs-25

2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
author: Paul Eggert 2017-01-01 01:10:47 -0800
committer: Paul Eggert 2017-01-01 01:10:47 -0800
commit: bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch)
tree: dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /test
parent: 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff)
parent: 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff)
download: emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz
emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip
141 files changed, 3258 insertions, 132 deletions
diff --git a/test/ChangeLog.1 b/test/ChangeLog.1
index 367ca74b7b9..4491eb82d67 100644
--- a/test/ChangeLog.1
+++ b/test/ChangeLog.1
@@ -2952,7 +2952,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 2008-2016 Free Software Foundation, Inc.
+  Copyright (C) 2008-2017 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/test/Makefile.in b/test/Makefile.in
index f2f27634c24..5849e9c3ac9 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
-# Copyright (C) 2010-2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/test/README b/test/README
index fec84a8756c..fca20166821 100644
--- a/test/README
+++ b/test/README
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2016 Free Software Foundation, Inc.
+Copyright (C) 2008-2017 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 This directory contains files intended to test various aspects of
diff --git a/test/automated/abbrev-tests.el b/test/automated/abbrev-tests.el
new file mode 100644
index 00000000000..7adab32892e
--- /dev/null
+++ b/test/automated/abbrev-tests.el
@@ -0,0 +1,98 @@
+;;; abbrev-tests.el --- Test suite for abbrevs.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
+;; Author: Eli Zaretskii <eliz@gnu.org>
+;; Keywords: abbrevs
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;; `kill-all-abbrevs-test' will remove all user *and* system abbrevs
+;; if called noninteractively with the init file loaded.
+;;; Code:
+(require 'ert)
+(require 'abbrev)
+(require 'seq)
+;; set up test abbrev table and abbrev entry
+(defun setup-test-abbrev-table ()
+  (defvar ert-test-abbrevs nil)
+  (define-abbrev-table 'ert-test-abbrevs '(("a-e-t" "abbrev-ert-test")))
+  (abbrev-table-put ert-test-abbrevs :ert-test "ert-test-value")
+  ert-test-abbrevs)
+(ert-deftest copy-abbrev-table-test ()
+  (defvar foo-abbrev-table nil)         ; Avoid compiler warning
+  (define-abbrev-table 'foo-abbrev-table
+    '())
+  (should (abbrev-table-p foo-abbrev-table))
+  ;; Bug 21828
+  (let ((new-foo-abbrev-table
+         (condition-case nil
+             (copy-abbrev-table foo-abbrev-table)
+           (error nil))))
+    (should (abbrev-table-p new-foo-abbrev-table)))
+  (should-not (string-equal (buffer-name) "*Backtrace*")))
+(ert-deftest kill-all-abbrevs-test ()
+  "Test undefining all defined abbrevs"
+  (unless noninteractive
+    (ert-skip "Cannot test kill-all-abbrevs in interactive mode"))
+  (let ((num-tables 0))
+    ;; ensure at least one abbrev exists
+    (should (abbrev-table-p (setup-test-abbrev-table)))
+    (setf num-tables (length abbrev-table-name-list))
+    (kill-all-abbrevs)
+    ;; no tables should have been removed/added
+    (should (= num-tables (length abbrev-table-name-list)))
+    ;; number of empty tables should be the same as number of tables
+    (should (= num-tables (length (seq-filter
+                                   (lambda (table)
+                                       (abbrev-table-empty-p (symbol-value table)))
+                                   abbrev-table-name-list))))))
+(ert-deftest abbrev-table-name-test ()
+  "Test returning name of abbrev-table"
+  (let ((ert-test-abbrevs (setup-test-abbrev-table))
+        (no-such-table nil))
+    (should (equal 'ert-test-abbrevs (abbrev-table-name ert-test-abbrevs)))
+    (should (equal nil (abbrev-table-name no-such-table)))))
+(ert-deftest clear-abbrev-table-test ()
+  "Test clearing single abbrev table"
+  (let ((ert-test-abbrevs (setup-test-abbrev-table)))
+    (should (equal "a-e-t" (symbol-name
+                            (abbrev-symbol "a-e-t" ert-test-abbrevs))))
+    (should (equal "abbrev-ert-test" (symbol-value
+                                      (abbrev-symbol "a-e-t" ert-test-abbrevs))))
+    (clear-abbrev-table ert-test-abbrevs)
+    (should (equal "nil" (symbol-name
+                          (abbrev-symbol "a-e-t" ert-test-abbrevs))))
+    (should (equal nil (symbol-value
+                        (abbrev-symbol "a-e-t" ert-test-abbrevs))))
+    (should (equal t (abbrev-table-empty-p ert-test-abbrevs)))))
+(provide 'abbrev-tests)
+;;; abbrev-tests.el ends here
diff --git a/test/automated/cl-seq-tests.el b/test/automated/cl-seq-tests.el
new file mode 100644
index 00000000000..d89bad9bfb4
--- /dev/null
+++ b/test/automated/cl-seq-tests.el
@@ -0,0 +1,42 @@
+;;; cl-seq-tests.el --- Tests for cl-seq.el functionality  -*- lexical-binding: t; -*-
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
+;; Author: Nicolas Richard <youngfrog@members.fsf.org>
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;;; Code:
+(require 'ert)
+(require 'cl-seq)
+(ert-deftest cl-union-test-00 ()
+  (let ((str1 "foo")
+        (str2 (make-string 3 ?o)))
+    ;; Emacs may make two string literals eql when reading.
+    (aset str2 0 ?f)
+    (should (not (eql str1 str2)))
+    (should (equal str1 str2))
+    (should (equal (cl-union (list str1) (list str2))
+                   (list str2)))
+    (should (equal (cl-union (list str1) (list str2) :test 'eql)
+                   (list str1 str2)))))
+(provide 'cl-seq-tests)
+;;; cl-seq-tests.el ends here
diff --git a/test/automated/coding-tests.el b/test/automated/coding-tests.el
new file mode 100644
index 00000000000..c0ad8d555b3
--- /dev/null
+++ b/test/automated/coding-tests.el
@@ -0,0 +1,50 @@
+;;; coding-tests.el --- tests for text encoding and decoding
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
+;; Author: Eli Zaretskii <eliz@gnu.org>
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Code:
+(require 'ert)
+;; Directory to hold test data files.
+(defvar coding-tests-workdir
+  (expand-file-name "coding-tests" temporary-file-directory))
+;; Remove all generated test files.
+(defun coding-tests-remove-files ()
+  (delete-directory coding-tests-workdir t))
+(ert-deftest ert-test-coding-bogus-coding-systems ()
+  (unwind-protect
+      (let (test-file)
+        (or (file-directory-p coding-tests-workdir)
+            (mkdir coding-tests-workdir t))
+        (setq test-file (expand-file-name "nonexistent" coding-tests-workdir))
+        (if (file-exists-p test-file)
+            (delete-file test-file))
+        (should-error
+         (let ((coding-system-for-read 'bogus))
+           (insert-file-contents test-file)))
+        ;; See bug #21602.
+        (setq test-file (expand-file-name "writing" coding-tests-workdir))
+        (should-error
+         (let ((coding-system-for-write (intern "\"us-ascii\"")))
+           (write-region "some text" nil test-file))))
+    (coding-tests-remove-files)))
diff --git a/test/automated/core-elisp-tests.el b/test/automated/core-elisp-tests.el
new file mode 100644
index 00000000000..0851367f9bc
--- /dev/null
+++ b/test/automated/core-elisp-tests.el
@@ -0,0 +1,52 @@
+;;; core-elisp-tests.el --- Testing some core Elisp rules
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords:
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;;
+;;; Code:
+(ert-deftest core-elisp-tests-1-defvar-in-let ()
+  "Test some core Elisp rules."
+  (with-temp-buffer
+    ;; Check that when defvar is run within a let-binding, the toplevel default
+    ;; is properly initialized.
+    (should (equal (list (let ((c-e-x 1)) (defvar c-e-x 2) c-e-x) c-e-x)
+                   '(1 2)))
+    (should (equal (list (let ((c-e-x 1))
+                           (defcustom c-e-x 2 "doc" :group 'blah :type 'integer) c-e-x)
+                         c-e-x)
+                   '(1 2)))))
+(ert-deftest core-elisp-tests-2-window-configurations ()
+  "Test properties of window-configurations."
+  (let ((wc (current-window-configuration)))
+    (with-current-buffer (window-buffer (frame-selected-window))
+      (push-mark)
+      (activate-mark))
+    (set-window-configuration wc)
+    (should (or (not mark-active) (mark)))))
+(ert-deftest core-elisp-tests-3-backquote ()
+  (should (eq 3 (eval ``,,'(+ 1 2)))))
+(provide 'core-elisp-tests)
+;;; core-elisp-tests.el ends here
diff --git a/test/automated/data-tests.el b/test/automated/data-tests.el
new file mode 100644
index 00000000000..9abc9e7c68f
--- /dev/null
+++ b/test/automated/data-tests.el
@@ -0,0 +1,257 @@
+;;; data-tests.el --- tests for src/data.c
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;;; Code:
+(require 'cl-lib)
+(eval-when-compile (require 'cl))
+(ert-deftest data-tests-= ()
+  (should-error (=))
+  (should (= 1))
+  (should (= 2 2))
+  (should (= 9 9 9 9 9 9 9 9 9))
+  (should-not (apply #'= '(3 8 3)))
+  (should-error (= 9 9 'foo))
+  ;; Short circuits before getting to bad arg
+  (should-not (= 9 8 'foo)))
+(ert-deftest data-tests-< ()
+  (should-error (<))
+  (should (< 1))
+  (should (< 2 3))
+  (should (< -6 -1 0 2 3 4 8 9 999))
+  (should-not (apply #'< '(3 8 3)))
+  (should-error (< 9 10 'foo))
+  ;; Short circuits before getting to bad arg
+  (should-not (< 9 8 'foo)))
+(ert-deftest data-tests-> ()
+  (should-error (>))
+  (should (> 1))
+  (should (> 3 2))
+  (should (> 6 1 0 -2 -3 -4 -8 -9 -999))
+  (should-not (apply #'> '(3 8 3)))
+  (should-error (> 9 8 'foo))
+  ;; Short circuits before getting to bad arg
+  (should-not (> 8 9 'foo)))
+(ert-deftest data-tests-<= ()
+  (should-error (<=))
+  (should (<= 1))
+  (should (<= 2 3))
+  (should (<= -6 -1 -1 0 0 0 2 3 4 8 999))
+  (should-not (apply #'<= '(3 8 3 3)))
+  (should-error (<= 9 10 'foo))
+  ;; Short circuits before getting to bad arg
+  (should-not (<= 9 8 'foo)))
+(ert-deftest data-tests->= ()
+  (should-error (>=))
+  (should (>= 1))
+  (should (>= 3 2))
+  (should (>= 666 1 0 0 -2 -3 -3 -3 -4 -8 -8 -9 -999))
+  (should-not (apply #'>= '(3 8 3)))
+  (should-error (>= 9 8 'foo))
+  ;; Short circuits before getting to bad arg
+  (should-not (>= 8 9 'foo)))
+;; Bool vector tests.  Compactly represent bool vectors as hex
+;; strings.
+(ert-deftest bool-vector-count-population-all-0-nil ()
+  (cl-loop for sz in '(0 45 1 64 9 344)
+           do (let* ((bv (make-bool-vector sz nil)))
+                (should
+                 (zerop
+                  (bool-vector-count-population bv))))))
+(ert-deftest bool-vector-count-population-all-1-t ()
+  (cl-loop for sz in '(0 45 1 64 9 344)
+           do (let* ((bv (make-bool-vector sz t)))
+                (should
+                 (eql
+                  (bool-vector-count-population bv)
+                  sz)))))
+(ert-deftest bool-vector-count-population-1-nil ()
+  (let* ((bv (make-bool-vector 45 nil)))
+    (aset bv 40 t)
+    (aset bv 0 t)
+    (should
+     (eql
+      (bool-vector-count-population bv)
+      2))))
+(ert-deftest bool-vector-count-population-1-t ()
+  (let* ((bv (make-bool-vector 45 t)))
+    (aset bv 40 nil)
+    (aset bv 0 nil)
+    (should
+     (eql
+      (bool-vector-count-population bv)
+      43))))
+(defun mock-bool-vector-count-consecutive (a b i)
+  (loop for i from i below (length a)
+        while (eq (aref a i) b)
+        sum 1))
+(defun test-bool-vector-bv-from-hex-string (desc)
+  (let (bv nchars nibbles)
+    (dolist (c (string-to-list desc))
+      (push (string-to-number
+             (char-to-string c)
+             16)
+            nibbles))
+    (setf bv (make-bool-vector (* 4 (length nibbles)) nil))
+    (let ((i 0))
+      (dolist (n (nreverse nibbles))
+        (dotimes (_ 4)
+          (aset bv i (> (logand 1 n) 0))
+          (incf i)
+          (setf n (lsh n -1)))))
+    bv))
+(defun test-bool-vector-to-hex-string (bv)
+  (let (nibbles (v (cl-coerce bv 'list)))
+    (while v
+      (push (logior
+             (lsh (if (nth 0 v) 1 0) 0)
+             (lsh (if (nth 1 v) 1 0) 1)
+             (lsh (if (nth 2 v) 1 0) 2)
+             (lsh (if (nth 3 v) 1 0) 3))
+            nibbles)
+      (setf v (nthcdr 4 v)))
+    (mapconcat (lambda (n) (format "%X" n))
+               (nreverse nibbles)
+               "")))
+(defun test-bool-vector-count-consecutive-tc (desc)
+  "Run a test case for bool-vector-count-consecutive.
+DESC is a string describing the test.  It is a sequence of
+hexadecimal digits describing the bool vector.  We exhaustively
+test all counts at all possible positions in the vector by
+comparing the subr with a much slower lisp implementation."
+  (let ((bv (test-bool-vector-bv-from-hex-string desc)))
+    (loop
+     for lf in '(nil t)
+     do (loop
+         for pos from 0 upto (length bv)
+         for cnt = (mock-bool-vector-count-consecutive bv lf pos)
+         for rcnt = (bool-vector-count-consecutive bv lf pos)
+         unless (eql cnt rcnt)
+         do (error "FAILED testcase %S %3S %3S %3S"
+                   pos lf cnt rcnt)))))
+(defconst bool-vector-test-vectors
+'(""
+  "0"
+  "F"
+  "0F"
+  "F0"
+  "00000000000000000000000000000FFFFF0000000"
+  "44a50234053fba3340000023444a50234053fba33400000234"
+  "12341234123456123412346001234123412345612341234600"
+  "44a50234053fba33400000234"
+  "1234123412345612341234600"
+  "44a50234053fba33400000234"
+  "1234123412345612341234600"
+  "44a502340"
+  "123412341"
+  "0000000000000000000000000"
+  "FFFFFFFFFFFFFFFF1"))
+(ert-deftest bool-vector-count-consecutive ()
+  (mapc #'test-bool-vector-count-consecutive-tc
+        bool-vector-test-vectors))
+(defun test-bool-vector-apply-mock-op (mock a b c)
+  "Compute (slowly) the correct result of a bool-vector set operation."
+  (let (changed nv)
+    (assert (eql (length b) (length c)))
+    (if a (setf nv a)
+      (setf a (make-bool-vector (length b) nil))
+      (setf changed t))
+    (loop for i below (length b)
+          for mockr = (funcall mock
+                               (if (aref b i) 1 0)
+                               (if (aref c i) 1 0))
+          for r = (not (= 0 mockr))
+          do (progn
+               (unless (eq (aref a i) r)
+                 (setf changed t))
+               (setf (aref a i) r)))
+    (if changed a)))
+(defun test-bool-vector-binop (mock real)
+  "Test a binary set operation."
+  (loop for s1 in bool-vector-test-vectors
+        for bv1 = (test-bool-vector-bv-from-hex-string s1)
+        for vecs2 = (cl-remove-if-not
+                     (lambda (x) (eql (length x) (length s1)))
+                     bool-vector-test-vectors)
+        do (loop for s2 in vecs2
+                 for bv2 = (test-bool-vector-bv-from-hex-string s2)
+                 for mock-result = (test-bool-vector-apply-mock-op
+                                    mock nil bv1 bv2)
+                 for real-result = (funcall real bv1 bv2)
+                 do (progn
+                      (should (equal mock-result real-result))))))
+(ert-deftest bool-vector-intersection-op ()
+  (test-bool-vector-binop
+   #'logand
+   #'bool-vector-intersection))
+(ert-deftest bool-vector-union-op ()
+  (test-bool-vector-binop
+   #'logior
+   #'bool-vector-union))
+(ert-deftest bool-vector-xor-op ()
+  (test-bool-vector-binop
+   #'logxor
+   #'bool-vector-exclusive-or))
+(ert-deftest bool-vector-set-difference-op ()
+  (test-bool-vector-binop
+   (lambda (a b) (logand a (lognot b)))
+   #'bool-vector-set-difference))
+(ert-deftest bool-vector-change-detection ()
+  (let* ((vc1 (test-bool-vector-bv-from-hex-string "abcdef"))
+         (vc2 (test-bool-vector-bv-from-hex-string "012345"))
+         (vc3 (make-bool-vector (length vc1) nil))
+         (c1 (bool-vector-union vc1 vc2 vc3))
+         (c2 (bool-vector-union vc1 vc2 vc3)))
+    (should (equal c1 (test-bool-vector-apply-mock-op
+                       #'logior
+                       nil
+                       vc1 vc2)))
+    (should (not c2))))
+(ert-deftest bool-vector-not ()
+  (let* ((v1 (test-bool-vector-bv-from-hex-string "FFFF3"))
+         (v2 (test-bool-vector-bv-from-hex-string "0000C"))
+         (v3 (bool-vector-not v1)))
+    (should (equal v2 v3))))
diff --git a/test/automated/help-fns.el b/test/automated/help-fns.el
new file mode 100644
index 00000000000..2bcd71b83f6
--- /dev/null
+++ b/test/automated/help-fns.el
@@ -0,0 +1,70 @@
+;;; help-fns.el --- tests for help-fns.el
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
+;; Maintainer: emacs-devel@gnu.org
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;;; Code:
+(require 'ert)
+(autoload 'help-fns-test--macro "help-fns" nil nil t)
+(ert-deftest help-fns-test-bug17410 ()
+  "Test for http://debbugs.gnu.org/17410 ."
+  (describe-function 'help-fns-test--macro)
+  (with-current-buffer "*Help*"
+    (goto-char (point-min))
+    (should (search-forward "autoloaded Lisp macro" (line-end-position)))))
+(defun abc\\\[universal-argument\]b\`c\'d\\e\"f (x)
+  "A function with a funny name.
+\(fn XYZZY)"
+  x)
+(defun defgh\\\[universal-argument\]b\`c\'d\\e\"f (x)
+  "Another function with a funny name."
+  x)
+(ert-deftest help-fns-test-funny-names ()
+  "Test for help with functions with funny names."
+  (describe-function 'abc\\\[universal-argument\]b\`c\'d\\e\"f)
+  (with-current-buffer "*Help*"
+    (goto-char (point-min))
+    (should (search-forward
+             "(abc\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f XYZZY)")))
+  (describe-function 'defgh\\\[universal-argument\]b\`c\'d\\e\"f)
+  (with-current-buffer "*Help*"
+    (goto-char (point-min))
+    (should (search-forward
+             "(defgh\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f X)"))))
+(ert-deftest help-fns-test-describe-symbol ()
+  "Test the `describe-symbol' function."
+  ;; 'describe-symbol' would originally signal an error for
+  ;; 'font-lock-comment-face'.
+  (describe-symbol 'font-lock-comment-face)
+  (with-current-buffer "*Help*"
+    (should (> (point-max) 1))
+    (goto-char (point-min))
+    (should (looking-at "^font-lock-comment-face is "))))
+;;; help-fns.el ends here
diff --git a/test/automated/lexbind-tests.el b/test/automated/lexbind-tests.el
new file mode 100644
index 00000000000..483bd1a7cd4
--- /dev/null
+++ b/test/automated/lexbind-tests.el
@@ -0,0 +1,75 @@
+;;; lexbind-tests.el --- Testing the lexbind byte-compiler
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords:
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;;
+;;; Code:
+(require 'ert)
+(defconst lexbind-tests
+  `(
+    (let ((f #'car))
+      (let ((f (lambda (x) (cons (funcall f x) (cdr x)))))
+        (funcall f '(1 . 2))))
+    )
+  "List of expression for test.
+Each element will be executed by interpreter and with
+bytecompiled code, and their results compared.")
+(defun lexbind-check-1 (pat)
+  "Return non-nil if PAT is the same whether directly evalled or compiled."
+  (let ((warning-minimum-log-level :emergency)
+        (byte-compile-warnings nil)
+        (v0 (condition-case nil
+                (eval pat t)
+              (error nil)))
+        (v1 (condition-case nil
+                (funcall (let ((lexical-binding t))
+                           (byte-compile `(lambda nil ,pat))))
+              (error nil))))
+    (equal v0 v1)))
+(put 'lexbind-check-1 'ert-explainer 'lexbind-explain-1)
+(defun lexbind-explain-1 (pat)
+  (let ((v0 (condition-case nil
+                (eval pat t)
+              (error nil)))
+        (v1 (condition-case nil
+                (funcall (let ((lexical-binding t))
+                           (byte-compile (list 'lambda nil pat))))
+              (error nil))))
+    (format "Expression `%s' gives `%s' if directly evalled, `%s' if compiled."
+            pat v0 v1)))
+(ert-deftest lexbind-tests ()
+  "Test the Emacs byte compiler lexbind handling."
+  (dolist (pat lexbind-tests)
+    (should (lexbind-check-1 pat))))
+(provide 'lexbind-tests)
+;;; lexbind-tests.el ends here
diff --git a/test/automated/syntax-tests.el b/test/automated/syntax-tests.el
new file mode 100644
index 00000000000..7afafdfa768
--- /dev/null
+++ b/test/automated/syntax-tests.el
@@ -0,0 +1,97 @@
+;;; syntax-tests.el --- Testing syntax rules and basic movement -*- lexical-binding: t -*-
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
+;; Author: Daniel Colascione <dancol@dancol.org>
+;; Keywords:
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;;
+;;; Code:
+(require 'ert)
+(require 'cl-lib)
+(defun run-up-list-test (fn data start instructions)
+  (cl-labels ((posof (thing)
+                (and (symbolp thing)
+                     (= (length (symbol-name thing)) 1)
+                     (- (aref (symbol-name thing) 0) ?a -1))))
+    (with-temp-buffer
+      (set-syntax-table (make-syntax-table))
+      ;; Use a syntax table in which single quote is a string
+      ;; character so that we can embed the test data in a lisp string
+      ;; literal.
+      (modify-syntax-entry ?\' "\"")
+      (insert data)
+      (goto-char (posof start))
+      (dolist (instruction instructions)
+        (cond ((posof instruction)
+               (funcall fn)
+               (should (eql (point) (posof instruction))))
+              ((symbolp instruction)
+               (should-error (funcall fn)
+                             :type instruction))
+              (t (cl-assert nil nil "unknown ins")))))))
+(defmacro define-up-list-test (name fn data start &rest expected)
+  `(ert-deftest ,name ()
+     (run-up-list-test ,fn ,data ',start ',expected)))
+(define-up-list-test up-list-basic
+  (lambda () (up-list))
+  (or "(1 1 (1 1) 1 (1 1) 1)")
+  ;;   abcdefghijklmnopqrstuv
+  i k v scan-error)
+(define-up-list-test up-list-with-forward-sexp-function
+  (lambda ()
+    (let ((forward-sexp-function
+           (lambda (&optional arg)
+             (let ((forward-sexp-function nil))
+               (forward-sexp arg)))))
+      (up-list)))
+  (or "(1 1 (1 1) 1 (1 1) 1)")
+  ;;   abcdefghijklmnopqrstuv
+  i k v scan-error)
+(define-up-list-test up-list-out-of-string
+  (lambda () (up-list 1 t))
+  (or "1 (1 '2 2 (2 2 2' 1) 1")
+  ;;   abcdefghijklmnopqrstuvwxy
+  o r u scan-error)
+(define-up-list-test up-list-cross-string
+  (lambda () (up-list 1 t))
+  (or "(1 '2 ( 2' 1 '2 ) 2' 1)")
+  ;;   abcdefghijklmnopqrstuvwxy
+  i r u x scan-error)
+(define-up-list-test up-list-no-cross-string
+  (lambda () (up-list 1 t t))
+  (or "(1 '2 ( 2' 1 '2 ) 2' 1)")
+  ;;   abcdefghijklmnopqrstuvwxy
+  i k x scan-error)
+(define-up-list-test backward-up-list-basic
+  (lambda () (backward-up-list))
+  (or "(1 1 (1 1) 1 (1 1) 1)")
+  ;;   abcdefghijklmnopqrstuv
+  i f a scan-error)
+(provide 'syntax-tests)
+;;; syntax-tests.el ends here
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
new file mode 100644
index 00000000000..10e1bde51e7
--- /dev/null
+++ b/test/automated/tramp-tests.el
@@ -0,0 +1,2383 @@
+;;; tramp-tests.el --- Tests of remote file access
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
+;; Author: Michael Albinus <michael.albinus@gmx.de>
+;; This program is free software: you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see `http://www.gnu.org/licenses/'.
+;;; Commentary:
+;; The tests require a recent ert.el from Emacs 24.4.
+;; Some of the tests require access to a remote host files.  Since
+;; this could be problematic, a mock-up connection method "mock" is
+;; used.  Emulating a remote connection, it simply calls "sh -i".
+;; Tramp's file name handlers still run, so this test is sufficient
+;; except for connection establishing.
+;; If you want to test a real Tramp connection, set
+;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order to
+;; overwrite the default value.  If you want to skip tests accessing a
+;; remote host, set this environment variable to "/dev/null" or
+;; whatever is appropriate on your system.
+;; A whole test run can be performed calling the command `tramp-test-all'.
+;;; Code:
+(require 'ert)
+(require 'tramp)
+(require 'vc)
+(require 'vc-bzr)
+(require 'vc-git)
+(require 'vc-hg)
+(autoload 'dired-uncache "dired")
+(declare-function tramp-find-executable "tramp-sh")
+(declare-function tramp-get-remote-path "tramp-sh")
+(declare-function tramp-get-remote-stat "tramp-sh")
+(declare-function tramp-get-remote-perl "tramp-sh")
+(defvar tramp-copy-size-limit)
+(defvar tramp-persistency-file-name)
+(defvar tramp-remote-process-environment)
+;; There is no default value on w32 systems, which could work out of the box.
+(defconst tramp-test-temporary-file-directory
+  (cond
+   ((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
+   ((eq system-type 'windows-nt) null-device)
+   (t (add-to-list
+       'tramp-methods
+       '("mock"
+         (tramp-login-program        "sh")
+         (tramp-login-args           (("-i")))
+         (tramp-remote-shell         "/bin/sh")
+         (tramp-remote-shell-args    ("-c"))
+         (tramp-connection-timeout   10)))
+      (format "/mock::%s" temporary-file-directory)))
+  "Temporary directory for Tramp tests.")
+(setq password-cache-expiry nil
+      tramp-verbose 0
+      tramp-copy-size-limit nil
+      tramp-message-show-message nil
+      tramp-persistency-file-name nil)
+;; This shall happen on hydra only.
+(when (getenv "NIX_STORE")
+  (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
+(defvar tramp--test-enabled-checked nil
+  "Cached result of `tramp--test-enabled'.
+If the function did run, the value is a cons cell, the `cdr'
+being the result.")
+(defun tramp--test-enabled ()
+  "Whether remote file access is enabled."
+  (unless (consp tramp--test-enabled-checked)
+    (setq
+     tramp--test-enabled-checked
+     (cons
+      t (ignore-errors
+          (and
+           (file-remote-p tramp-test-temporary-file-directory)
+           (file-directory-p tramp-test-temporary-file-directory)
+           (file-writable-p tramp-test-temporary-file-directory))))))
+  (when (cdr tramp--test-enabled-checked)
+    ;; Cleanup connection.
+    (ignore-errors
+      (tramp-cleanup-connection
+       (tramp-dissect-file-name tramp-test-temporary-file-directory)
+       nil 'keep-password)))
+  ;; Return result.
+  (cdr tramp--test-enabled-checked))
+(defun tramp--test-make-temp-name (&optional local)
+  "Create a temporary file name for test."
+  (expand-file-name
+   (make-temp-name "tramp-test")
+   (if local temporary-file-directory tramp-test-temporary-file-directory)))
+(defmacro tramp--instrument-test-case (verbose &rest body)
+  "Run BODY with `tramp-verbose' equal VERBOSE.
+Print the the content of the Tramp debug buffer, if BODY does not
+eval properly in `should', `should-not' or `should-error'.  BODY
+shall not contain a timeout."
+  (declare (indent 1) (debug (natnump body)))
+  `(let ((tramp-verbose ,verbose)
+         (tramp-message-show-message t)
+         (tramp-debug-on-error t)
+         (debug-ignored-errors
+          (cons "^make-symbolic-link not supported$" debug-ignored-errors)))
+     (unwind-protect
+         (progn ,@body)
+       (when (> tramp-verbose 3)
+         (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
+           (with-current-buffer (tramp-get-connection-buffer v)
+             (message "%s" (buffer-string)))
+           (with-current-buffer (tramp-get-debug-buffer v)
+             (message "%s" (buffer-string))))))))
+(ert-deftest tramp-test00-availability ()
+  "Test availability of Tramp functions."
+  :expected-result (if (tramp--test-enabled) :passed :failed)
+  (message "Remote directory: `%s'" tramp-test-temporary-file-directory)
+  (should (ignore-errors
+            (and
+             (file-remote-p tramp-test-temporary-file-directory)
+             (file-directory-p tramp-test-temporary-file-directory)
+             (file-writable-p tramp-test-temporary-file-directory)))))
+(ert-deftest tramp-test01-file-name-syntax ()
+  "Check remote file name syntax."
+  ;; Simple cases.
+  (should (tramp-tramp-file-p "/method::"))
+  (should (tramp-tramp-file-p "/host:"))
+  (should (tramp-tramp-file-p "/user@:"))
+  (should (tramp-tramp-file-p "/user@host:"))
+  (should (tramp-tramp-file-p "/method:host:"))
+  (should (tramp-tramp-file-p "/method:user@:"))
+  (should (tramp-tramp-file-p "/method:user@host:"))
+  (should (tramp-tramp-file-p "/method:user@email@host:"))
+  ;; Using a port.
+  (should (tramp-tramp-file-p "/host#1234:"))
+  (should (tramp-tramp-file-p "/user@host#1234:"))
+  (should (tramp-tramp-file-p "/method:host#1234:"))
+  (should (tramp-tramp-file-p "/method:user@host#1234:"))
+  ;; Using an IPv4 address.
+  (should (tramp-tramp-file-p "/1.2.3.4:"))
+  (should (tramp-tramp-file-p "/user@1.2.3.4:"))
+  (should (tramp-tramp-file-p "/method:1.2.3.4:"))
+  (should (tramp-tramp-file-p "/method:user@1.2.3.4:"))
+  ;; Using an IPv6 address.
+  (should (tramp-tramp-file-p "/[]:"))
+  (should (tramp-tramp-file-p "/[::1]:"))
+  (should (tramp-tramp-file-p "/user@[::1]:"))
+  (should (tramp-tramp-file-p "/method:[::1]:"))
+  (should (tramp-tramp-file-p "/method:user@[::1]:"))
+  ;; Local file name part.
+  (should (tramp-tramp-file-p "/host:/:"))
+  (should (tramp-tramp-file-p "/method:::"))
+  (should (tramp-tramp-file-p "/method::/path/to/file"))
+  (should (tramp-tramp-file-p "/method::file"))
+  ;; Multihop.
+  (should (tramp-tramp-file-p "/method1:|method2::"))
+  (should (tramp-tramp-file-p "/method1:host1|host2:"))
+  (should (tramp-tramp-file-p "/method1:host1|method2:host2:"))
+  (should (tramp-tramp-file-p "/method1:user1@host1|method2:user2@host2:"))
+  (should (tramp-tramp-file-p
+           "/method1:user1@host1|method2:user2@host2|method3:user3@host3:"))
+  ;; No strings.
+  (should-not (tramp-tramp-file-p nil))
+  (should-not (tramp-tramp-file-p 'symbol))
+  ;; "/:" suppresses file name handlers.
+  (should-not (tramp-tramp-file-p "/::"))
+  (should-not (tramp-tramp-file-p "/:@:"))
+  (should-not (tramp-tramp-file-p "/:[]:"))
+  ;; Multihops require a method.
+  (should-not (tramp-tramp-file-p "/host1|host2:"))
+  ;; Methods or hostnames shall be at least two characters on MS Windows.
+  (when (memq system-type '(cygwin windows-nt))
+      (should-not (tramp-tramp-file-p "/c:/path/to/file"))
+      (should-not (tramp-tramp-file-p "/c::/path/to/file"))))
+(ert-deftest tramp-test02-file-name-dissect ()
+  "Check remote file name components."
+  (let ((tramp-default-method "default-method")
+        (tramp-default-user "default-user")
+        (tramp-default-host "default-host"))
+    ;; Expand `tramp-default-user' and `tramp-default-host'.
+    (should (string-equal
+             (file-remote-p "/method::")
+             (format "/%s:%s@%s:" "method" "default-user" "default-host")))
+    (should (string-equal (file-remote-p "/method::" 'method) "method"))
+    (should (string-equal (file-remote-p "/method::" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/method::" 'host) "default-host"))
+    (should (string-equal (file-remote-p "/method::" 'localname) ""))
+    (should (string-equal (file-remote-p "/method::" 'hop) nil))
+    ;; Expand `tramp-default-method' and `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/host:")
+             (format "/%s:%s@%s:" "default-method" "default-user" "host")))
+    (should (string-equal (file-remote-p "/host:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/host:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/host:" 'host) "host"))
+    (should (string-equal (file-remote-p "/host:" 'localname) ""))
+    (should (string-equal (file-remote-p "/host:" 'hop) nil))
+    ;; Expand `tramp-default-method' and `tramp-default-host'.
+    (should (string-equal
+             (file-remote-p "/user@:")
+             (format "/%s:%s@%s:" "default-method""user" "default-host")))
+    (should (string-equal (file-remote-p "/user@:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/user@:" 'user) "user"))
+    (should (string-equal (file-remote-p "/user@:" 'host) "default-host"))
+    (should (string-equal (file-remote-p "/user@:" 'localname) ""))
+    (should (string-equal (file-remote-p "/user@:" 'hop) nil))
+    ;; Expand `tramp-default-method'.
+    (should (string-equal
+             (file-remote-p "/user@host:")
+             (format "/%s:%s@%s:" "default-method" "user" "host")))
+    (should (string-equal
+             (file-remote-p "/user@host:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/user@host:" 'user) "user"))
+    (should (string-equal (file-remote-p "/user@host:" 'host) "host"))
+    (should (string-equal (file-remote-p "/user@host:" 'localname) ""))
+    (should (string-equal (file-remote-p "/user@host:" 'hop) nil))
+    ;; Expand `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/method:host:")
+             (format "/%s:%s@%s:" "method" "default-user" "host")))
+    (should (string-equal (file-remote-p "/method:host:" 'method) "method"))
+    (should (string-equal (file-remote-p "/method:host:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/method:host:" 'host) "host"))
+    (should (string-equal (file-remote-p "/method:host:" 'localname) ""))
+    (should (string-equal (file-remote-p "/method:host:" 'hop) nil))
+    ;; Expand `tramp-default-host'.
+    (should (string-equal
+             (file-remote-p "/method:user@:")
+             (format "/%s:%s@%s:" "method" "user" "default-host")))
+    (should (string-equal (file-remote-p "/method:user@:" 'method) "method"))
+    (should (string-equal (file-remote-p "/method:user@:" 'user) "user"))
+    (should (string-equal (file-remote-p "/method:user@:" 'host)
+                          "default-host"))
+    (should (string-equal (file-remote-p "/method:user@:" 'localname) ""))
+    (should (string-equal (file-remote-p "/method:user@:" 'hop) nil))
+    ;; No expansion.
+    (should (string-equal
+             (file-remote-p "/method:user@host:")
+             (format "/%s:%s@%s:" "method" "user" "host")))
+    (should (string-equal
+             (file-remote-p "/method:user@host:" 'method) "method"))
+    (should (string-equal (file-remote-p "/method:user@host:" 'user) "user"))
+    (should (string-equal (file-remote-p "/method:user@host:" 'host) "host"))
+    (should (string-equal (file-remote-p "/method:user@host:" 'localname) ""))
+    (should (string-equal (file-remote-p "/method:user@host:" 'hop) nil))
+    ;; No expansion.
+    (should (string-equal
+             (file-remote-p "/method:user@email@host:")
+             (format "/%s:%s@%s:" "method" "user@email" "host")))
+    (should (string-equal
+             (file-remote-p "/method:user@email@host:" 'method) "method"))
+    (should (string-equal
+             (file-remote-p "/method:user@email@host:" 'user) "user@email"))
+    (should (string-equal
+             (file-remote-p "/method:user@email@host:" 'host) "host"))
+    (should (string-equal
+             (file-remote-p "/method:user@email@host:" 'localname) ""))
+    (should (string-equal
+             (file-remote-p "/method:user@email@host:" 'hop) nil))
+    ;; Expand `tramp-default-method' and `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/host#1234:")
+             (format "/%s:%s@%s:" "default-method" "default-user" "host#1234")))
+    (should (string-equal
+             (file-remote-p "/host#1234:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/host#1234:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/host#1234:" 'host) "host#1234"))
+    (should (string-equal (file-remote-p "/host#1234:" 'localname) ""))
+    (should (string-equal (file-remote-p "/host#1234:" 'hop) nil))
+    ;; Expand `tramp-default-method'.
+    (should (string-equal
+             (file-remote-p "/user@host#1234:")
+             (format "/%s:%s@%s:" "default-method" "user" "host#1234")))
+    (should (string-equal
+             (file-remote-p "/user@host#1234:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/user@host#1234:" 'user) "user"))
+    (should (string-equal (file-remote-p "/user@host#1234:" 'host) "host#1234"))
+    (should (string-equal (file-remote-p "/user@host#1234:" 'localname) ""))
+    (should (string-equal (file-remote-p "/user@host#1234:" 'hop) nil))
+    ;; Expand `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/method:host#1234:")
+             (format "/%s:%s@%s:" "method" "default-user" "host#1234")))
+    (should (string-equal
+             (file-remote-p "/method:host#1234:" 'method) "method"))
+    (should (string-equal
+             (file-remote-p "/method:host#1234:" 'user) "default-user"))
+    (should (string-equal
+             (file-remote-p "/method:host#1234:" 'host) "host#1234"))
+    (should (string-equal (file-remote-p "/method:host#1234:" 'localname) ""))
+    (should (string-equal (file-remote-p "/method:host#1234:" 'hop) nil))
+    ;; No expansion.
+    (should (string-equal
+             (file-remote-p "/method:user@host#1234:")
+             (format "/%s:%s@%s:" "method" "user" "host#1234")))
+    (should (string-equal
+             (file-remote-p "/method:user@host#1234:" 'method) "method"))
+    (should (string-equal
+             (file-remote-p "/method:user@host#1234:" 'user) "user"))
+    (should (string-equal
+             (file-remote-p "/method:user@host#1234:" 'host) "host#1234"))
+    (should (string-equal
+             (file-remote-p "/method:user@host#1234:" 'localname) ""))
+    (should (string-equal
+             (file-remote-p "/method:user@host#1234:" 'hop) nil))
+    ;; Expand `tramp-default-method' and `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/1.2.3.4:")
+             (format "/%s:%s@%s:" "default-method" "default-user" "1.2.3.4")))
+    (should (string-equal (file-remote-p "/1.2.3.4:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/1.2.3.4:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/1.2.3.4:" 'host) "1.2.3.4"))
+    (should (string-equal (file-remote-p "/1.2.3.4:" 'localname) ""))
+    (should (string-equal (file-remote-p "/1.2.3.4:" 'hop) nil))
+    ;; Expand `tramp-default-method'.
+    (should (string-equal
+             (file-remote-p "/user@1.2.3.4:")
+             (format "/%s:%s@%s:" "default-method" "user" "1.2.3.4")))
+    (should (string-equal
+             (file-remote-p "/user@1.2.3.4:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/user@1.2.3.4:" 'user) "user"))
+    (should (string-equal (file-remote-p "/user@1.2.3.4:" 'host) "1.2.3.4"))
+    (should (string-equal (file-remote-p "/user@1.2.3.4:" 'localname) ""))
+    (should (string-equal (file-remote-p "/user@1.2.3.4:" 'hop) nil))
+    ;; Expand `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/method:1.2.3.4:")
+             (format "/%s:%s@%s:" "method" "default-user" "1.2.3.4")))
+    (should (string-equal (file-remote-p "/method:1.2.3.4:" 'method) "method"))
+    (should (string-equal
+             (file-remote-p "/method:1.2.3.4:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/method:1.2.3.4:" 'host) "1.2.3.4"))
+    (should (string-equal (file-remote-p "/method:1.2.3.4:" 'localname) ""))
+    (should (string-equal (file-remote-p "/method:1.2.3.4:" 'hop) nil))
+    ;; No expansion.
+    (should (string-equal
+             (file-remote-p "/method:user@1.2.3.4:")
+             (format "/%s:%s@%s:" "method" "user" "1.2.3.4")))
+    (should (string-equal
+             (file-remote-p "/method:user@1.2.3.4:" 'method) "method"))
+    (should (string-equal (file-remote-p "/method:user@1.2.3.4:" 'user) "user"))
+    (should (string-equal
+             (file-remote-p "/method:user@1.2.3.4:" 'host) "1.2.3.4"))
+    (should (string-equal
+             (file-remote-p "/method:user@1.2.3.4:" 'localname) ""))
+    (should (string-equal
+             (file-remote-p "/method:user@1.2.3.4:" 'hop) nil))
+    ;; Expand `tramp-default-method', `tramp-default-user' and
+    ;; `tramp-default-host'.
+    (should (string-equal
+             (file-remote-p "/[]:")
+             (format
+              "/%s:%s@%s:" "default-method" "default-user" "default-host")))
+    (should (string-equal (file-remote-p "/[]:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/[]:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/[]:" 'host) "default-host"))
+    (should (string-equal (file-remote-p "/[]:" 'localname) ""))
+    (should (string-equal (file-remote-p "/[]:" 'hop) nil))
+    ;; Expand `tramp-default-method' and `tramp-default-user'.
+    (let ((tramp-default-host "::1"))
+      (should (string-equal
+               (file-remote-p "/[]:")
+               (format "/%s:%s@%s:" "default-method" "default-user" "[::1]")))
+      (should (string-equal (file-remote-p "/[]:" 'method) "default-method"))
+      (should (string-equal (file-remote-p "/[]:" 'user) "default-user"))
+      (should (string-equal (file-remote-p "/[]:" 'host) "::1"))
+      (should (string-equal (file-remote-p "/[]:" 'localname) ""))
+      (should (string-equal (file-remote-p "/[]:" 'hop) nil)))
+    ;; Expand `tramp-default-method' and `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/[::1]:")
+             (format "/%s:%s@%s:" "default-method" "default-user" "[::1]")))
+    (should (string-equal (file-remote-p "/[::1]:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/[::1]:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/[::1]:" 'host) "::1"))
+    (should (string-equal (file-remote-p "/[::1]:" 'localname) ""))
+    (should (string-equal (file-remote-p "/[::1]:" 'hop) nil))
+    ;; Expand `tramp-default-method'.
+    (should (string-equal
+             (file-remote-p "/user@[::1]:")
+             (format "/%s:%s@%s:" "default-method" "user" "[::1]")))
+    (should (string-equal
+             (file-remote-p "/user@[::1]:" 'method) "default-method"))
+    (should (string-equal (file-remote-p "/user@[::1]:" 'user) "user"))
+    (should (string-equal (file-remote-p "/user@[::1]:" 'host) "::1"))
+    (should (string-equal (file-remote-p "/user@[::1]:" 'localname) ""))
+    (should (string-equal (file-remote-p "/user@[::1]:" 'hop) nil))
+    ;; Expand `tramp-default-user'.
+    (should (string-equal
+             (file-remote-p "/method:[::1]:")
+             (format "/%s:%s@%s:" "method" "default-user" "[::1]")))
+    (should (string-equal (file-remote-p "/method:[::1]:" 'method) "method"))
+    (should (string-equal
+             (file-remote-p "/method:[::1]:" 'user) "default-user"))
+    (should (string-equal (file-remote-p "/method:[::1]:" 'host) "::1"))
+    (should (string-equal (file-remote-p "/method:[::1]:" 'localname) ""))
+    (should (string-equal (file-remote-p "/method:[::1]:" 'hop) nil))
+    ;; No expansion.
+    (should (string-equal
+             (file-remote-p "/method:user@[::1]:")
+             (format "/%s:%s@%s:" "method" "user" "[::1]")))
+    (should (string-equal
+             (file-remote-p "/method:user@[::1]:" 'method) "method"))
+    (should (string-equal (file-remote-p "/method:user@[::1]:" 'user) "user"))
+    (should (string-equal (file-remote-p "/method:user@[::1]:" 'host) "::1"))
+    (should (string-equal
+             (file-remote-p "/method:user@[::1]:" 'localname) ""))
+    (should (string-equal (file-remote-p "/method:user@[::1]:" 'hop) nil))
+    ;; Local file name part.
+    (should (string-equal (file-remote-p "/host:/:" 'localname) "/:"))
+    (should (string-equal (file-remote-p "/method:::" 'localname) ":"))
+    (should (string-equal (file-remote-p "/method:: " 'localname) " "))
+    (should (string-equal (file-remote-p "/method::file" 'localname) "file"))
+    (should (string-equal
+             (file-remote-p "/method::/path/to/file" 'localname)
+             "/path/to/file"))
+    ;; Multihop.
+    (should
+     (string-equal
+      (file-remote-p "/method1:user1@host1|method2:user2@host2:/path/to/file")
+      (format "/%s:%s@%s|%s:%s@%s:"
+              "method1" "user1" "host1" "method2" "user2" "host2")))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2:/path/to/file" 'method)
+      "method2"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2:/path/to/file" 'user)
+      "user2"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2:/path/to/file" 'host)
+      "host2"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2:/path/to/file" 'localname)
+      "/path/to/file"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2:/path/to/file" 'hop)
+      (format "%s:%s@%s|"
+              "method1" "user1" "host1")))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2|method3:user3@host3:/path/to/file")
+      (format "/%s:%s@%s|%s:%s@%s|%s:%s@%s:"
+              "method1" "user1" "host1"
+              "method2" "user2" "host2"
+              "method3" "user3" "host3")))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2|method3:user3@host3:/path/to/file"
+       'method)
+      "method3"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2|method3:user3@host3:/path/to/file"
+       'user)
+      "user3"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2|method3:user3@host3:/path/to/file"
+       'host)
+      "host3"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2|method3:user3@host3:/path/to/file"
+       'localname)
+      "/path/to/file"))
+    (should
+     (string-equal
+      (file-remote-p
+       "/method1:user1@host1|method2:user2@host2|method3:user3@host3:/path/to/file"
+       'hop)
+      (format "%s:%s@%s|%s:%s@%s|"
+              "method1" "user1" "host1" "method2" "user2" "host2")))))
+(ert-deftest tramp-test03-file-name-defaults ()
+  "Check default values for some methods."
+  ;; Default values in tramp-adb.el.
+  (should (string-equal (file-remote-p "/adb::" 'host) ""))
+  ;; Default values in tramp-ftp.el.
+  (should (string-equal (file-remote-p "/ftp.host:" 'method) "ftp"))
+  (dolist (u '("ftp" "anonymous"))
+    (should (string-equal (file-remote-p (format "/%s@:" u) 'method) "ftp")))
+  ;; Default values in tramp-gvfs.el.
+  (when (and (load "tramp-gvfs" 'noerror 'nomessage)
+             (symbol-value 'tramp-gvfs-enabled))
+    (should (string-equal (file-remote-p "/synce::" 'user) nil)))
+  ;; Default values in tramp-gw.el.
+  (dolist (m '("tunnel" "socks"))
+    (should
+     (string-equal (file-remote-p (format "/%s::" m) 'user) (user-login-name))))
+  ;; Default values in tramp-sh.el.
+  (dolist (h `("127.0.0.1" "[::1]" "localhost" "localhost6" ,(system-name)))
+    (should (string-equal (file-remote-p (format "/root@%s:" h) 'method) "su")))
+  (dolist (m '("su" "sudo" "ksu"))
+    (should (string-equal (file-remote-p (format "/%s::" m) 'user) "root")))
+  (dolist (m '("rcp" "remcp" "rsh" "telnet" "krlogin" "fcp"))
+    (should
+     (string-equal (file-remote-p (format "/%s::" m) 'user) (user-login-name))))
+  ;; Default values in tramp-smb.el.
+  (should (string-equal (file-remote-p "/user%domain@host:" 'method) "smb"))
+  (should (string-equal (file-remote-p "/smb::" 'user) nil)))
+(ert-deftest tramp-test04-substitute-in-file-name ()
+  "Check `substitute-in-file-name'."
+  (should (string-equal (substitute-in-file-name "/method:host://foo") "/foo"))
+  (should
+   (string-equal
+    (substitute-in-file-name "/method:host:/path//foo") "/method:host:/foo"))
+  (should
+   (string-equal (substitute-in-file-name "/method:host:/path///foo")   "/foo"))
+  (should
+   (string-equal
+    (substitute-in-file-name "/method:host:/path/~/foo") "/method:host:~/foo"))
+  (should
+   (string-equal (substitute-in-file-name "/method:host:/path//~/foo") "~/foo"))
+  (let (process-environment)
+    (should
+     (string-equal
+      (substitute-in-file-name "/method:host:/path/$FOO")
+      "/method:host:/path/$FOO"))
+    (setenv "FOO" "bla")
+    (should
+     (string-equal
+      (substitute-in-file-name "/method:host:/path/$FOO")
+      "/method:host:/path/bla"))
+    (should
+     (string-equal
+      (substitute-in-file-name "/method:host:/path/$$FOO")
+      "/method:host:/path/$FOO"))))
+(ert-deftest tramp-test05-expand-file-name ()
+  "Check `expand-file-name'."
+  (should
+   (string-equal
+    (expand-file-name "/method:host:/path/./file") "/method:host:/path/file"))
+  (should
+   (string-equal
+    (expand-file-name "/method:host:/path/../file") "/method:host:/file")))
+(ert-deftest tramp-test06-directory-file-name ()
+  "Check `directory-file-name'.
+This checks also `file-name-as-directory', `file-name-directory',
+`file-name-nondirectory' and `unhandled-file-name-directory'."
+  (should
+   (string-equal
+    (directory-file-name "/method:host:/path/to/file")
+    "/method:host:/path/to/file"))
+  (should
+   (string-equal
+    (directory-file-name "/method:host:/path/to/file/")
+    "/method:host:/path/to/file"))
+  (should
+   (string-equal
+    (file-name-as-directory "/method:host:/path/to/file")
+    "/method:host:/path/to/file/"))
+  (should
+   (string-equal
+    (file-name-as-directory "/method:host:/path/to/file/")
+    "/method:host:/path/to/file/"))
+  (should
+   (string-equal
+    (file-name-directory "/method:host:/path/to/file")
+    "/method:host:/path/to/"))
+  (should
+   (string-equal
+    (file-name-directory "/method:host:/path/to/file/")
+    "/method:host:/path/to/file/"))
+  (should
+   (string-equal (file-name-nondirectory "/method:host:/path/to/file") "file"))
+  (should
+   (string-equal (file-name-nondirectory "/method:host:/path/to/file/") ""))
+  (should-not
+   (unhandled-file-name-directory "/method:host:/path/to/file")))
+(ert-deftest tramp-test07-file-exists-p ()
+  "Check `file-exist-p', `write-region' and `delete-file'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    (should-not (file-exists-p tmp-name))
+    (write-region "foo" nil tmp-name)
+    (should (file-exists-p tmp-name))
+    (delete-file tmp-name)
+    (should-not (file-exists-p tmp-name))))
+(ert-deftest tramp-test08-file-local-copy ()
+  "Check `file-local-copy'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name1 (tramp--test-make-temp-name))
+        tmp-name2)
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (should (setq tmp-name2 (file-local-copy tmp-name1)))
+          (with-temp-buffer
+            (insert-file-contents tmp-name2)
+            (should (string-equal (buffer-string) "foo")))
+          ;; Check also that a file transfer with compression works.
+          (let ((default-directory tramp-test-temporary-file-directory)
+                (tramp-copy-size-limit 4)
+                (tramp-inline-compress-start-size 2))
+            (delete-file tmp-name2)
+            (should (setq tmp-name2 (file-local-copy tmp-name1)))))
+      ;; Cleanup.
+      (ignore-errors
+        (delete-file tmp-name1)
+        (delete-file tmp-name2)))))
+(ert-deftest tramp-test09-insert-file-contents ()
+  "Check `insert-file-contents'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name)
+          (with-temp-buffer
+            (insert-file-contents tmp-name)
+            (should (string-equal (buffer-string) "foo"))
+            (insert-file-contents tmp-name)
+            (should (string-equal (buffer-string) "foofoo"))
+            ;; Insert partly.
+            (insert-file-contents tmp-name nil 1 3)
+            (should (string-equal (buffer-string) "oofoofoo"))
+            ;; Replace.
+            (insert-file-contents tmp-name nil nil nil 'replace)
+            (should (string-equal (buffer-string) "foo"))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))))
+(ert-deftest tramp-test10-write-region ()
+  "Check `write-region'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          (with-temp-buffer
+            (insert "foo")
+            (write-region nil nil tmp-name))
+          (with-temp-buffer
+            (insert-file-contents tmp-name)
+            (should (string-equal (buffer-string) "foo")))
+          ;; Append.
+          (with-temp-buffer
+            (insert "bla")
+            (write-region nil nil tmp-name 'append))
+          (with-temp-buffer
+            (insert-file-contents tmp-name)
+            (should (string-equal (buffer-string) "foobla")))
+          ;; Write string.
+          (write-region "foo" nil tmp-name)
+          (with-temp-buffer
+            (insert-file-contents tmp-name)
+            (should (string-equal (buffer-string) "foo")))
+          ;; Write partly.
+          (with-temp-buffer
+            (insert "123456789")
+            (write-region 3 5 tmp-name))
+          (with-temp-buffer
+            (insert-file-contents tmp-name)
+            (should (string-equal (buffer-string) "34"))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))))
+(ert-deftest tramp-test11-copy-file ()
+  "Check `copy-file'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name1 (tramp--test-make-temp-name))
+        (tmp-name2 (tramp--test-make-temp-name))
+        (tmp-name3 (tramp--test-make-temp-name))
+        (tmp-name4 (tramp--test-make-temp-name 'local))
+        (tmp-name5 (tramp--test-make-temp-name 'local)))
+    ;; Copy on remote side.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (copy-file tmp-name1 tmp-name2)
+          (should (file-exists-p tmp-name2))
+          (with-temp-buffer
+            (insert-file-contents tmp-name2)
+            (should (string-equal (buffer-string) "foo")))
+          (should-error (copy-file tmp-name1 tmp-name2))
+          (copy-file tmp-name1 tmp-name2 'ok)
+          (make-directory tmp-name3)
+          (copy-file tmp-name1 tmp-name3)
+          (should
+           (file-exists-p
+            (expand-file-name (file-name-nondirectory tmp-name1) tmp-name3))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-file tmp-name2))
+      (ignore-errors (delete-directory tmp-name3 'recursive)))
+    ;; Copy from remote side to local side.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (copy-file tmp-name1 tmp-name4)
+          (should (file-exists-p tmp-name4))
+          (with-temp-buffer
+            (insert-file-contents tmp-name4)
+            (should (string-equal (buffer-string) "foo")))
+          (should-error (copy-file tmp-name1 tmp-name4))
+          (copy-file tmp-name1 tmp-name4 'ok)
+          (make-directory tmp-name5)
+          (copy-file tmp-name1 tmp-name5)
+          (should
+           (file-exists-p
+            (expand-file-name (file-name-nondirectory tmp-name1) tmp-name5))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-file tmp-name4))
+      (ignore-errors (delete-directory tmp-name5 'recursive)))
+    ;; Copy from local side to remote side.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name4 nil 'nomessage)
+          (copy-file tmp-name4 tmp-name1)
+          (should (file-exists-p tmp-name1))
+          (with-temp-buffer
+            (insert-file-contents tmp-name1)
+            (should (string-equal (buffer-string) "foo")))
+          (should-error (copy-file tmp-name4 tmp-name1))
+          (copy-file tmp-name4 tmp-name1 'ok)
+          (make-directory tmp-name3)
+          (copy-file tmp-name4 tmp-name3)
+          (should
+           (file-exists-p
+            (expand-file-name (file-name-nondirectory tmp-name4) tmp-name3))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-file tmp-name4))
+      (ignore-errors (delete-directory tmp-name3 'recursive)))))
+(ert-deftest tramp-test12-rename-file ()
+  "Check `rename-file'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name1 (tramp--test-make-temp-name))
+        (tmp-name2 (tramp--test-make-temp-name))
+        (tmp-name3 (tramp--test-make-temp-name))
+        (tmp-name4 (tramp--test-make-temp-name 'local))
+        (tmp-name5 (tramp--test-make-temp-name 'local)))
+    ;; Rename on remote side.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (rename-file tmp-name1 tmp-name2)
+          (should-not (file-exists-p tmp-name1))
+          (should (file-exists-p tmp-name2))
+          (with-temp-buffer
+            (insert-file-contents tmp-name2)
+            (should (string-equal (buffer-string) "foo")))
+          (write-region "foo" nil tmp-name1)
+          (should-error (rename-file tmp-name1 tmp-name2))
+          (rename-file tmp-name1 tmp-name2 'ok)
+          (should-not (file-exists-p tmp-name1))
+          (write-region "foo" nil tmp-name1)
+          (make-directory tmp-name3)
+          (rename-file tmp-name1 tmp-name3)
+          (should-not (file-exists-p tmp-name1))
+          (should
+           (file-exists-p
+            (expand-file-name (file-name-nondirectory tmp-name1) tmp-name3))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-file tmp-name2))
+      (ignore-errors (delete-directory tmp-name3 'recursive)))
+    ;; Rename from remote side to local side.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (rename-file tmp-name1 tmp-name4)
+          (should-not (file-exists-p tmp-name1))
+          (should (file-exists-p tmp-name4))
+          (with-temp-buffer
+            (insert-file-contents tmp-name4)
+            (should (string-equal (buffer-string) "foo")))
+          (write-region "foo" nil tmp-name1)
+          (should-error (rename-file tmp-name1 tmp-name4))
+          (rename-file tmp-name1 tmp-name4 'ok)
+          (should-not (file-exists-p tmp-name1))
+          (write-region "foo" nil tmp-name1)
+          (make-directory tmp-name5)
+          (rename-file tmp-name1 tmp-name5)
+          (should-not (file-exists-p tmp-name1))
+          (should
+           (file-exists-p
+            (expand-file-name (file-name-nondirectory tmp-name1) tmp-name5))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-file tmp-name4))
+      (ignore-errors (delete-directory tmp-name5 'recursive)))
+    ;; Rename from local side to remote side.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name4 nil 'nomessage)
+          (rename-file tmp-name4 tmp-name1)
+          (should-not (file-exists-p tmp-name4))
+          (should (file-exists-p tmp-name1))
+          (with-temp-buffer
+            (insert-file-contents tmp-name1)
+            (should (string-equal (buffer-string) "foo")))
+          (write-region "foo" nil tmp-name4 nil 'nomessage)
+          (should-error (rename-file tmp-name4 tmp-name1))
+          (rename-file tmp-name4 tmp-name1 'ok)
+          (should-not (file-exists-p tmp-name4))
+          (write-region "foo" nil tmp-name4 nil 'nomessage)
+          (make-directory tmp-name3)
+          (rename-file tmp-name4 tmp-name3)
+          (should-not (file-exists-p tmp-name4))
+          (should
+           (file-exists-p
+            (expand-file-name (file-name-nondirectory tmp-name4) tmp-name3))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-file tmp-name4))
+      (ignore-errors (delete-directory tmp-name3 'recursive)))))
+(ert-deftest tramp-test13-make-directory ()
+  "Check `make-directory'.
+This tests also `file-directory-p' and `file-accessible-directory-p'."
+  (skip-unless (tramp--test-enabled))
+  (let* ((tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (expand-file-name "foo/bar" tmp-name1)))
+    (unwind-protect
+        (progn
+          (make-directory tmp-name1)
+          (should (file-directory-p tmp-name1))
+          (should (file-accessible-directory-p tmp-name1))
+          (should-error (make-directory tmp-name2) :type 'file-error)
+          (make-directory tmp-name2 'parents)
+          (should (file-directory-p tmp-name2))
+          (should (file-accessible-directory-p tmp-name2)))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name1 'recursive)))))
+(ert-deftest tramp-test14-delete-directory ()
+  "Check `delete-directory'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    ;; Delete empty directory.
+    (make-directory tmp-name)
+    (should (file-directory-p tmp-name))
+    (delete-directory tmp-name)
+    (should-not (file-directory-p tmp-name))
+    ;; Delete non-empty directory.
+    (make-directory tmp-name)
+    (write-region "foo" nil (expand-file-name "bla" tmp-name))
+    (should-error (delete-directory tmp-name) :type 'file-error)
+    (delete-directory tmp-name 'recursive)
+    (should-not (file-directory-p tmp-name))))
+(ert-deftest tramp-test15-copy-directory ()
+  "Check `copy-directory'."
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (not
+    (eq
+     (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+     'tramp-smb-file-name-handler)))
+  (let* ((tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (tramp--test-make-temp-name))
+         (tmp-name3 (expand-file-name
+                     (file-name-nondirectory tmp-name1) tmp-name2))
+         (tmp-name4 (expand-file-name "foo" tmp-name1))
+         (tmp-name5 (expand-file-name "foo" tmp-name2))
+         (tmp-name6 (expand-file-name "foo" tmp-name3)))
+    (unwind-protect
+        (progn
+          ;; Copy empty directory.
+          (make-directory tmp-name1)
+          (write-region "foo" nil tmp-name4)
+          (should (file-directory-p tmp-name1))
+          (should (file-exists-p tmp-name4))
+          (copy-directory tmp-name1 tmp-name2)
+          (should (file-directory-p tmp-name2))
+          (should (file-exists-p tmp-name5))
+          ;; Target directory does exist already.
+          (copy-directory tmp-name1 tmp-name2)
+          (should (file-directory-p tmp-name3))
+          (should (file-exists-p tmp-name6)))
+      ;; Cleanup.
+      (ignore-errors
+        (delete-directory tmp-name1 'recursive)
+        (delete-directory tmp-name2 'recursive)))))
+(ert-deftest tramp-test16-directory-files ()
+  "Check `directory-files'."
+  (skip-unless (tramp--test-enabled))
+  (let* ((tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (expand-file-name "bla" tmp-name1))
+         (tmp-name3 (expand-file-name "foo" tmp-name1)))
+    (unwind-protect
+        (progn
+          (make-directory tmp-name1)
+          (write-region "foo" nil tmp-name2)
+          (write-region "bla" nil tmp-name3)
+          (should (file-directory-p tmp-name1))
+          (should (file-exists-p tmp-name2))
+          (should (file-exists-p tmp-name3))
+          (should (equal (directory-files tmp-name1) '("." ".." "bla" "foo")))
+          (should (equal (directory-files tmp-name1 'full)
+                         `(,(concat tmp-name1 "/.")
+                           ,(concat tmp-name1 "/..")
+                           ,tmp-name2 ,tmp-name3)))
+          (should (equal (directory-files
+                          tmp-name1 nil directory-files-no-dot-files-regexp)
+                         '("bla" "foo")))
+          (should (equal (directory-files
+                          tmp-name1 'full directory-files-no-dot-files-regexp)
+                         `(,tmp-name2 ,tmp-name3))))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name1 'recursive)))))
+(ert-deftest tramp-test17-insert-directory ()
+  "Check `insert-directory'."
+  (skip-unless (tramp--test-enabled))
+  (let* ((tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (expand-file-name "foo" tmp-name1))
+         ;; We test for the summary line.  Keyword "total" could be localized.
+         (process-environment
+          (append '("LANG=C" "LANGUAGE=C" "LC_ALL=C") process-environment)))
+    (unwind-protect
+        (progn
+          (make-directory tmp-name1)
+          (write-region "foo" nil tmp-name2)
+          (should (file-directory-p tmp-name1))
+          (should (file-exists-p tmp-name2))
+          (with-temp-buffer
+            (insert-directory tmp-name1 nil)
+            (goto-char (point-min))
+            (should (looking-at-p (regexp-quote tmp-name1))))
+          (with-temp-buffer
+            (insert-directory tmp-name1 "-al")
+            (goto-char (point-min))
+            (should (looking-at-p (format "^.+ %s$" (regexp-quote tmp-name1)))))
+          (with-temp-buffer
+            (insert-directory (file-name-as-directory tmp-name1) "-al")
+            (goto-char (point-min))
+            (should
+             (looking-at-p (format "^.+ %s/$" (regexp-quote tmp-name1)))))
+          (with-temp-buffer
+            (insert-directory
+             (file-name-as-directory tmp-name1) "-al" nil 'full-directory-p)
+            (goto-char (point-min))
+            (should
+             (looking-at-p
+              (concat
+               ;; There might be a summary line.
+               "\\(total.+[[:digit:]]+\n\\)?"
+               ;; We don't know in which order ".", ".." and "foo" appear.
+               "\\(.+ \\(\\.?\\.\\|foo\\)\n\\)\\{3\\}")))))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name1 'recursive)))))
+(ert-deftest tramp-test18-file-attributes ()
+  "Check `file-attributes'.
+This tests also `file-readable-p' and `file-regular-p'."
+  (skip-unless (tramp--test-enabled))
+  ;; We must use `file-truename' for the temporary directory, because
+  ;; it could be located on a symlinked directory.  This would let the
+  ;; test fail.
+  (let* ((tramp-test-temporary-file-directory
+          (file-truename tramp-test-temporary-file-directory))
+         (tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (tramp--test-make-temp-name))
+         ;; File name with "//".
+         (tmp-name3
+          (format
+           "%s%s"
+           (file-remote-p tmp-name1)
+           (replace-regexp-in-string
+            "/" "//" (file-remote-p tmp-name1 'localname))))
+         attr)
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (should (file-exists-p tmp-name1))
+          (setq attr (file-attributes tmp-name1))
+          (should (consp attr))
+          (should (file-exists-p tmp-name1))
+          (should (file-readable-p tmp-name1))
+          (should (file-regular-p tmp-name1))
+          ;; We do not test inodes and device numbers.
+          (should (null (car attr)))
+          (should (numberp (nth 1 attr))) ;; Link.
+          (should (numberp (nth 2 attr))) ;; Uid.
+          (should (numberp (nth 3 attr))) ;; Gid.
+          ;; Last access time.
+          (should (stringp (current-time-string (nth 4 attr))))
+          ;; Last modification time.
+          (should (stringp (current-time-string (nth 5 attr))))
+          ;; Last status change time.
+          (should (stringp (current-time-string (nth 6 attr))))
+          (should (numberp (nth 7 attr))) ;; Size.
+          (should (stringp (nth 8 attr))) ;; Modes.
+          (setq attr (file-attributes tmp-name1 'string))
+          (should (stringp (nth 2 attr))) ;; Uid.
+          (should (stringp (nth 3 attr))) ;; Gid.
+          (condition-case err
+              (progn
+                (make-symbolic-link tmp-name1 tmp-name2)
+                (should (file-exists-p tmp-name2))
+                (should (file-symlink-p tmp-name2))
+                (setq attr (file-attributes tmp-name2))
+                (should (string-equal
+                         (car attr)
+                         (file-remote-p (file-truename tmp-name1) 'localname)))
+                (delete-file tmp-name2))
+            (file-error
+             (should (string-equal (error-message-string err)
+                                   "make-symbolic-link not supported"))))
+          ;; Check, that "//" in symlinks are handled properly.
+          (with-temp-buffer
+            (let ((default-directory tramp-test-temporary-file-directory))
+              (shell-command
+               (format
+                "ln -s %s %s"
+                (tramp-file-name-localname (tramp-dissect-file-name tmp-name3))
+                (tramp-file-name-localname (tramp-dissect-file-name tmp-name2)))
+               t)))
+          (when (file-symlink-p tmp-name2)
+            (setq attr (file-attributes tmp-name2))
+            (should
+             (string-equal
+              (car attr)
+              (tramp-file-name-localname (tramp-dissect-file-name tmp-name3))))
+            (delete-file tmp-name2))
+          (delete-file tmp-name1)
+          (make-directory tmp-name1)
+          (should (file-exists-p tmp-name1))
+          (should (file-readable-p tmp-name1))
+          (should-not (file-regular-p tmp-name1))
+          (setq attr (file-attributes tmp-name1))
+          (should (eq (car attr) t)))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name1))
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-file tmp-name2)))))
+(ert-deftest tramp-test19-directory-files-and-attributes ()
+  "Check `directory-files-and-attributes'."
+  (skip-unless (tramp--test-enabled))
+  ;; `directory-files-and-attributes' contains also values for "../".
+  ;; Ensure that this doesn't change during tests, for
+  ;; example due to handling temporary files.
+  (let* ((tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (expand-file-name "bla" tmp-name1))
+         attr)
+    (unwind-protect
+        (progn
+          (make-directory tmp-name1)
+          (should (file-directory-p tmp-name1))
+          (make-directory tmp-name2)
+          (should (file-directory-p tmp-name2))
+          (write-region "foo" nil (expand-file-name "foo" tmp-name2))
+          (write-region "bar" nil (expand-file-name "bar" tmp-name2))
+          (write-region "boz" nil (expand-file-name "boz" tmp-name2))
+          (setq attr (directory-files-and-attributes tmp-name2))
+          (should (consp attr))
+          ;; Dumb remote shells without perl(1) or stat(1) are not
+          ;; able to return the date correctly.  They say "don't know".
+          (dolist (elt attr)
+            (unless
+                (equal
+                 (nth 5
+                      (file-attributes (expand-file-name (car elt) tmp-name2)))
+                 '(0 0))
+              (should
+               (equal (file-attributes (expand-file-name (car elt) tmp-name2))
+                      (cdr elt)))))
+          (setq attr (directory-files-and-attributes tmp-name2 'full))
+          (dolist (elt attr)
+            (unless (equal (nth 5 (file-attributes (car elt))) '(0 0))
+              (should
+               (equal (file-attributes (car elt)) (cdr elt)))))
+          (setq attr (directory-files-and-attributes tmp-name2 nil "^b"))
+          (should (equal (mapcar 'car attr) '("bar" "boz"))))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name1 'recursive)))))
+(ert-deftest tramp-test20-file-modes ()
+  "Check `file-modes'.
+This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (not
+    (memq
+     (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+     '(tramp-adb-file-name-handler
+       tramp-gvfs-file-name-handler
+       tramp-smb-file-name-handler))))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name)
+          (should (file-exists-p tmp-name))
+          (set-file-modes tmp-name #o777)
+          (should (= (file-modes tmp-name) #o777))
+          (should (file-executable-p tmp-name))
+          (should (file-writable-p tmp-name))
+          (set-file-modes tmp-name #o444)
+          (should (= (file-modes tmp-name) #o444))
+          (should-not (file-executable-p tmp-name))
+          ;; A file is always writable for user "root".
+          (unless (zerop (nth 2 (file-attributes tmp-name)))
+            (should-not (file-writable-p tmp-name))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))))
+(ert-deftest tramp-test21-file-links ()
+  "Check `file-symlink-p'.
+This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
+  (skip-unless (tramp--test-enabled))
+  ;; We must use `file-truename' for the temporary directory, because
+  ;; it could be located on a symlinked directory.  This would let the
+  ;; test fail.
+  (let* ((tramp-test-temporary-file-directory
+          (file-truename tramp-test-temporary-file-directory))
+         (tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (tramp--test-make-temp-name))
+         (tmp-name3 (tramp--test-make-temp-name 'local)))
+    ;; Check `make-symbolic-link'.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (should (file-exists-p tmp-name1))
+          ;; Method "smb" supports `make-symbolic-link' only if the
+          ;; remote host has CIFS capabilities.  tramp-adb.el and
+          ;; tramp-gvfs.el do not support symbolic links at all.
+          (condition-case err
+              (make-symbolic-link tmp-name1 tmp-name2)
+            (file-error
+             (skip-unless
+              (not (string-equal (error-message-string err)
+                                 "make-symbolic-link not supported")))))
+          (should (file-symlink-p tmp-name2))
+          (should-error (make-symbolic-link tmp-name1 tmp-name2))
+          (make-symbolic-link tmp-name1 tmp-name2 'ok-if-already-exists)
+          (should (file-symlink-p tmp-name2))
+          ;; `tmp-name3' is a local file name.
+          (should-error (make-symbolic-link tmp-name1 tmp-name3)))
+      ;; Cleanup.
+      (ignore-errors
+        (delete-file tmp-name1)
+        (delete-file tmp-name2)))
+    ;; Check `add-name-to-file'.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (should (file-exists-p tmp-name1))
+          (add-name-to-file tmp-name1 tmp-name2)
+          (should-not (file-symlink-p tmp-name2))
+          (should-error (add-name-to-file tmp-name1 tmp-name2))
+          (add-name-to-file tmp-name1 tmp-name2 'ok-if-already-exists)
+          (should-not (file-symlink-p tmp-name2))
+          ;; `tmp-name3' is a local file name.
+          (should-error (add-name-to-file tmp-name1 tmp-name3)))
+      ;; Cleanup.
+      (ignore-errors
+        (delete-file tmp-name1)
+        (delete-file tmp-name2)))
+    ;; Check `file-truename'.
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (should (file-exists-p tmp-name1))
+          (make-symbolic-link tmp-name1 tmp-name2)
+          (should (file-symlink-p tmp-name2))
+          (should-not (string-equal tmp-name2 (file-truename tmp-name2)))
+          (should
+           (string-equal (file-truename tmp-name1) (file-truename tmp-name2)))
+          (should (file-equal-p tmp-name1 tmp-name2)))
+      (ignore-errors
+        (delete-file tmp-name1)
+        (delete-file tmp-name2)))
+    ;; `file-truename' shall preserve trailing link of directories.
+    (unless (file-symlink-p tramp-test-temporary-file-directory)
+      (let* ((dir1 (directory-file-name tramp-test-temporary-file-directory))
+             (dir2 (file-name-as-directory dir1)))
+        (should (string-equal (file-truename dir1) (expand-file-name dir1)))
+        (should (string-equal (file-truename dir2) (expand-file-name dir2)))))))
+(ert-deftest tramp-test22-file-times ()
+  "Check `set-file-times' and `file-newer-than-file-p'."
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (not
+    (memq
+     (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+     '(tramp-gvfs-file-name-handler tramp-smb-file-name-handler))))
+  (let ((tmp-name1 (tramp--test-make-temp-name))
+        (tmp-name2 (tramp--test-make-temp-name))
+        (tmp-name3 (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name1)
+          (should (file-exists-p tmp-name1))
+          (should (consp (nth 5 (file-attributes tmp-name1))))
+          ;; '(0 0) means don't know, and will be replaced by
+          ;; `current-time'.  Therefore, we use '(0 1).
+          ;; We skip the test, if the remote handler is not able to
+          ;; set the correct time.
+          (skip-unless (set-file-times tmp-name1 '(0 1)))
+          ;; Dumb remote shells without perl(1) or stat(1) are not
+          ;; able to return the date correctly.  They say "don't know".
+          (unless (equal (nth 5 (file-attributes tmp-name1)) '(0 0))
+            (should (equal (nth 5 (file-attributes tmp-name1)) '(0 1)))
+            (write-region "bla" nil tmp-name2)
+            (should (file-exists-p tmp-name2))
+            (should (file-newer-than-file-p tmp-name2 tmp-name1))
+            ;; `tmp-name3' does not exist.
+            (should (file-newer-than-file-p tmp-name2 tmp-name3))
+            (should-not (file-newer-than-file-p tmp-name3 tmp-name1))))
+      ;; Cleanup.
+      (ignore-errors
+        (delete-file tmp-name1)
+        (delete-file tmp-name2)))))
+(ert-deftest tramp-test23-visited-file-modtime ()
+  "Check `set-visited-file-modtime' and `verify-visited-file-modtime'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          (write-region "foo" nil tmp-name)
+          (should (file-exists-p tmp-name))
+          (with-temp-buffer
+            (insert-file-contents tmp-name)
+            (should (verify-visited-file-modtime))
+            (set-visited-file-modtime '(0 1))
+            (should (verify-visited-file-modtime))
+            (should (equal (visited-file-modtime) '(0 1 0 0)))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))))
+(ert-deftest tramp-test24-file-name-completion ()
+  "Check `file-name-completion' and `file-name-all-completions'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          (make-directory tmp-name)
+          (should (file-directory-p tmp-name))
+          (write-region "foo" nil (expand-file-name "foo" tmp-name))
+          (write-region "bar" nil (expand-file-name "bold" tmp-name))
+          (make-directory (expand-file-name "boz" tmp-name))
+          (should (equal (file-name-completion "fo" tmp-name) "foo"))
+          (should (equal (file-name-completion "b" tmp-name) "bo"))
+          (should
+           (equal (file-name-completion "b" tmp-name 'file-directory-p) "boz/"))
+          (should (equal (file-name-all-completions "fo" tmp-name) '("foo")))
+          (should
+           (equal (sort (file-name-all-completions "b" tmp-name) 'string-lessp)
+                  '("bold" "boz/"))))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name 'recursive)))))
+(ert-deftest tramp-test25-load ()
+  "Check `load'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          (load tmp-name 'noerror 'nomessage)
+          (should-not (featurep 'tramp-test-load))
+          (write-region "(provide 'tramp-test-load)" nil tmp-name)
+          ;; `load' in lread.c does not pass `must-suffix'.  Why?
+          ;(should-error (load tmp-name nil 'nomessage 'nosuffix 'must-suffix))
+          (load tmp-name nil 'nomessage 'nosuffix)
+          (should (featurep 'tramp-test-load)))
+      ;; Cleanup.
+      (ignore-errors
+        (and (featurep 'tramp-test-load) (unload-feature 'tramp-test-load))
+        (delete-file tmp-name)))))
+(ert-deftest tramp-test26-process-file ()
+  "Check `process-file'."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (not
+    (memq
+     (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+     '(tramp-gvfs-file-name-handler tramp-smb-file-name-handler))))
+  (let* ((tmp-name (tramp--test-make-temp-name))
+         (fnnd (file-name-nondirectory tmp-name))
+         (default-directory tramp-test-temporary-file-directory)
+         kill-buffer-query-functions)
+    (unwind-protect
+        (progn
+          ;; We cannot use "/bin/true" and "/bin/false"; those paths
+          ;; do not exist on hydra.
+          (should (zerop (process-file "true")))
+          (should-not (zerop (process-file "false")))
+          (should-not (zerop (process-file "binary-does-not-exist")))
+          (with-temp-buffer
+            (write-region "foo" nil tmp-name)
+            (should (file-exists-p tmp-name))
+            (should (zerop (process-file "ls" nil t nil fnnd)))
+            ;; `ls' could produce colorized output.
+            (goto-char (point-min))
+            (while (re-search-forward tramp-color-escape-sequence-regexp nil t)
+              (replace-match "" nil nil))
+            (should (string-equal (format "%s\n" fnnd) (buffer-string)))
+            (should-not (get-buffer-window (current-buffer) t))
+            ;; Second run. The output must be appended.
+            (goto-char (point-max))
+            (should (zerop (process-file "ls" nil t t fnnd)))
+            ;; `ls' could produce colorized output.
+            (goto-char (point-min))
+            (while (re-search-forward tramp-color-escape-sequence-regexp nil t)
+              (replace-match "" nil nil))
+            (should
+             (string-equal (format "%s\n%s\n" fnnd fnnd) (buffer-string)))
+            ;; A non-nil DISPLAY must not raise the buffer.
+            (should-not (get-buffer-window (current-buffer) t))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))))
+(ert-deftest tramp-test27-start-file-process ()
+  "Check `start-file-process'."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (not
+    (memq
+     (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+     '(tramp-adb-file-name-handler
+       tramp-gvfs-file-name-handler
+       tramp-smb-file-name-handler))))
+  (let ((default-directory tramp-test-temporary-file-directory)
+        (tmp-name (tramp--test-make-temp-name))
+        kill-buffer-query-functions proc)
+    (unwind-protect
+        (with-temp-buffer
+          (setq proc (start-file-process "test1" (current-buffer) "cat"))
+          (should (processp proc))
+          (should (equal (process-status proc) 'run))
+          (process-send-string proc "foo")
+          (process-send-eof proc)
+          ;; Read output.
+          (with-timeout (10 (ert-fail "`start-file-process' timed out"))
+            (while (< (- (point-max) (point-min)) (length "foo"))
+              (accept-process-output proc 1)))
+          (should (string-equal (buffer-string) "foo")))
+      ;; Cleanup.
+      (ignore-errors (delete-process proc)))
+    (unwind-protect
+        (with-temp-buffer
+          (write-region "foo" nil tmp-name)
+          (should (file-exists-p tmp-name))
+          (setq proc
+                (start-file-process
+                 "test2" (current-buffer)
+                 "cat" (file-name-nondirectory tmp-name)))
+          (should (processp proc))
+          ;; Read output.
+          (with-timeout (10 (ert-fail "`start-file-process' timed out"))
+            (while (< (- (point-max) (point-min)) (length "foo"))
+              (accept-process-output proc 1)))
+          (should (string-equal (buffer-string) "foo")))
+      ;; Cleanup.
+      (ignore-errors
+        (delete-process proc)
+        (delete-file tmp-name)))
+    (unwind-protect
+        (with-temp-buffer
+          (setq proc (start-file-process "test3" (current-buffer) "cat"))
+          (should (processp proc))
+          (should (equal (process-status proc) 'run))
+          (set-process-filter
+           proc
+           (lambda (p s) (with-current-buffer (process-buffer p) (insert s))))
+          (process-send-string proc "foo")
+          (process-send-eof proc)
+          ;; Read output.
+          (with-timeout (10 (ert-fail "`start-file-process' timed out"))
+            (while (< (- (point-max) (point-min)) (length "foo"))
+              (accept-process-output proc 1)))
+          (should (string-equal (buffer-string) "foo")))
+      ;; Cleanup.
+      (ignore-errors (delete-process proc)))))
+(ert-deftest tramp-test28-shell-command ()
+  "Check `shell-command'."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (not
+    (memq
+     (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+     '(tramp-adb-file-name-handler
+       tramp-gvfs-file-name-handler
+       tramp-smb-file-name-handler))))
+  (let ((tmp-name (tramp--test-make-temp-name))
+        (default-directory tramp-test-temporary-file-directory)
+        kill-buffer-query-functions)
+    (unwind-protect
+        (with-temp-buffer
+          (write-region "foo" nil tmp-name)
+          (should (file-exists-p tmp-name))
+          (shell-command
+           (format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer))
+          ;; `ls' could produce colorized output.
+          (goto-char (point-min))
+          (while (re-search-forward tramp-color-escape-sequence-regexp nil t)
+            (replace-match "" nil nil))
+          (should
+           (string-equal
+            (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))
+    (unwind-protect
+        (with-temp-buffer
+          (write-region "foo" nil tmp-name)
+          (should (file-exists-p tmp-name))
+          (async-shell-command
+           (format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer))
+          (set-process-sentinel (get-buffer-process (current-buffer)) nil)
+          ;; Read output.
+          (with-timeout (10 (ert-fail "`async-shell-command' timed out"))
+            (while (< (- (point-max) (point-min))
+                      (1+ (length (file-name-nondirectory tmp-name))))
+              (accept-process-output (get-buffer-process (current-buffer)) 1)))
+          ;; `ls' could produce colorized output.
+          (goto-char (point-min))
+          (while (re-search-forward tramp-color-escape-sequence-regexp nil t)
+            (replace-match "" nil nil))
+          ;; There might be a nasty "Process *Async Shell* finished" message.
+          (goto-char (point-min))
+          (forward-line)
+          (narrow-to-region (point-min) (point))
+          (should
+           (string-equal
+            (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))
+    (unwind-protect
+        (with-temp-buffer
+          (write-region "foo" nil tmp-name)
+          (should (file-exists-p tmp-name))
+          (async-shell-command "read line; ls $line" (current-buffer))
+          (set-process-sentinel (get-buffer-process (current-buffer)) nil)
+          (process-send-string
+           (get-buffer-process (current-buffer))
+           (format "%s\n" (file-name-nondirectory tmp-name)))
+          ;; Read output.
+          (with-timeout (10 (ert-fail "`async-shell-command' timed out"))
+            (while (< (- (point-max) (point-min))
+                      (1+ (length (file-name-nondirectory tmp-name))))
+              (accept-process-output (get-buffer-process (current-buffer)) 1)))
+          ;; `ls' could produce colorized output.
+          (goto-char (point-min))
+          (while (re-search-forward tramp-color-escape-sequence-regexp nil t)
+            (replace-match "" nil nil))
+          ;; There might be a nasty "Process *Async Shell* finished" message.
+          (goto-char (point-min))
+          (forward-line)
+          (narrow-to-region (point-min) (point))
+          (should
+           (string-equal
+            (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name)))))
+(defun tramp-test--shell-command-to-string-asynchronously (command)
+  "Like `shell-command-to-string', but for asynchronous processes."
+  (with-temp-buffer
+    (async-shell-command command (current-buffer))
+    ;; Suppress nasty messages.
+    (set-process-sentinel (get-buffer-process (current-buffer)) nil)
+    (while (get-buffer-process (current-buffer))
+      (accept-process-output (get-buffer-process (current-buffer)) 0.1))
+    (accept-process-output)
+    (buffer-substring-no-properties (point-min) (point-max))))
+;; This test is inspired by Bug#23952.
+(ert-deftest tramp-test29-environment-variables ()
+  "Check that remote processes set / unset environment variables properly."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (dolist (this-shell-command-to-string
+           '(;; Synchronously.
+             shell-command-to-string
+             ;; Asynchronously.
+             tramp-test--shell-command-to-string-asynchronously))
+    (let ((default-directory tramp-test-temporary-file-directory)
+          (shell-file-name "/bin/sh")
+          (envvar (concat "VAR_" (upcase (md5 (current-time-string)))))
+          kill-buffer-query-functions)
+      (unwind-protect
+          ;; Set a value.
+          (let ((process-environment
+                 (cons (concat envvar "=foo") process-environment)))
+            ;; Default value.
+            (should
+             (string-match
+              "foo"
+              (funcall
+               this-shell-command-to-string
+               (format "echo -n ${%s:?bla}" envvar))))))
+      (unwind-protect
+          ;; Set the empty value.
+          (let ((process-environment
+                 (cons (concat envvar "=") process-environment)))
+            ;; Value is null.
+            (should
+             (string-match
+              "bla"
+              (funcall
+               this-shell-command-to-string
+               (format "echo -n ${%s:?bla}" envvar))))
+            ;; Variable is set.
+            (should
+             (string-match
+              (regexp-quote envvar)
+              (funcall this-shell-command-to-string "set")))))
+      ;; We force a reconnect, in order to have a clean environment.
+      (tramp-cleanup-connection
+       (tramp-dissect-file-name tramp-test-temporary-file-directory)
+       'keep-debug 'keep-password)
+      (unwind-protect
+          ;; Unset the variable.
+          (let ((tramp-remote-process-environment
+                 (cons (concat envvar "=foo")
+                       tramp-remote-process-environment)))
+            ;; Set the initial value, we want to unset below.
+            (should
+             (string-match
+              "foo"
+              (funcall
+               this-shell-command-to-string
+               (format "echo -n ${%s:?bla}" envvar))))
+            (let ((process-environment
+                   (cons envvar process-environment)))
+              ;; Variable is unset.
+              (should
+               (string-match
+                "bla"
+                (funcall
+                 this-shell-command-to-string
+                 (format "echo -n ${%s:?bla}" envvar))))
+              ;; Variable is unset.
+              (should-not
+               (string-match
+                (regexp-quote envvar)
+                (funcall this-shell-command-to-string "set")))))))))
+(ert-deftest tramp-test30-vc-registered ()
+  "Check `vc-registered'."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (let* ((default-directory tramp-test-temporary-file-directory)
+         (tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (expand-file-name "foo" tmp-name1))
+         (tramp-remote-process-environment tramp-remote-process-environment)
+         (vc-handled-backends
+          (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
+            (cond
+             ((tramp-find-executable v vc-git-program (tramp-get-remote-path v))
+              '(Git))
+             ((tramp-find-executable v vc-hg-program (tramp-get-remote-path v))
+              '(Hg))
+             ((tramp-find-executable v vc-bzr-program (tramp-get-remote-path v))
+              (setq tramp-remote-process-environment
+                    (cons (format "BZR_HOME=%s"
+                                  (file-remote-p tmp-name1 'localname))
+                          tramp-remote-process-environment))
+              ;; We must force a reconnect, in order to activate $BZR_HOME.
+              (tramp-cleanup-connection
+               (tramp-dissect-file-name tramp-test-temporary-file-directory)
+               nil 'keep-password)
+              '(Bzr))
+             (t nil)))))
+    (skip-unless vc-handled-backends)
+    (message "%s" vc-handled-backends)
+    (unwind-protect
+        (progn
+          (make-directory tmp-name1)
+          (write-region "foo" nil tmp-name2)
+          (should (file-directory-p tmp-name1))
+          (should (file-exists-p tmp-name2))
+          (should-not (vc-registered tmp-name1))
+          (should-not (vc-registered tmp-name2))
+          (let ((default-directory tmp-name1))
+            ;; Create empty repository, and register the file.
+            ;; Sometimes, creation of repository fails (bzr!); we skip
+            ;; the test then.
+            (condition-case nil
+                (vc-create-repo (car vc-handled-backends))
+              (error (skip-unless nil)))
+            ;; The structure of VC-FILESET is not documented.  Let's
+            ;; hope it won't change.
+            (condition-case nil
+                (vc-register
+                 (list (car vc-handled-backends)
+                       (list (file-name-nondirectory tmp-name2))))
+              ;; `vc-register' has changed its arguments in Emacs 25.1.
+              (error
+               (vc-register
+                nil (list (car vc-handled-backends)
+                          (list (file-name-nondirectory tmp-name2))))))
+            ;; vc-git uses an own process sentinel, Tramp's sentinel
+            ;; for flushing the cache isn't used.
+            (dired-uncache (concat (file-remote-p default-directory) "/"))
+            (should (vc-registered (file-name-nondirectory tmp-name2)))))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name1 'recursive)))))
+(ert-deftest tramp-test31-make-auto-save-file-name ()
+  "Check `make-auto-save-file-name'."
+  (skip-unless (tramp--test-enabled))
+  (let ((tmp-name1 (tramp--test-make-temp-name))
+        (tmp-name2 (tramp--test-make-temp-name)))
+    (unwind-protect
+        (progn
+          ;; Use default `auto-save-file-name-transforms' mechanism.
+          (let (tramp-auto-save-directory)
+            (with-temp-buffer
+              (setq buffer-file-name tmp-name1)
+              (should
+               (string-equal
+                (make-auto-save-file-name)
+                ;; This is taken from original `make-auto-save-file-name'.
+                (expand-file-name
+                 (format
+                  "#%s#"
+                  (subst-char-in-string
+                   ?/ ?! (replace-regexp-in-string "!" "!!" tmp-name1)))
+                 temporary-file-directory)))))
+          ;; No mapping.
+          (let (tramp-auto-save-directory auto-save-file-name-transforms)
+            (with-temp-buffer
+              (setq buffer-file-name tmp-name1)
+              (should
+               (string-equal
+                (make-auto-save-file-name)
+                (expand-file-name
+                 (format "#%s#" (file-name-nondirectory tmp-name1))
+                 tramp-test-temporary-file-directory)))))
+          ;; Use default `tramp-auto-save-directory' mechanism.
+          (let ((tramp-auto-save-directory tmp-name2))
+            (with-temp-buffer
+              (setq buffer-file-name tmp-name1)
+              (should
+               (string-equal
+                (make-auto-save-file-name)
+                ;; This is taken from Tramp.
+                (expand-file-name
+                 (format
+                  "#%s#"
+                  (tramp-subst-strs-in-string
+                   '(("_" . "|")
+                     ("/" . "_a")
+                     (":" . "_b")
+                     ("|" . "__")
+                     ("[" . "_l")
+                     ("]" . "_r"))
+                   tmp-name1))
+                 tmp-name2)))
+              (should (file-directory-p tmp-name2))))
+          ;; Relative file names shall work, too.
+          (let ((tramp-auto-save-directory "."))
+            (with-temp-buffer
+              (setq buffer-file-name tmp-name1
+                    default-directory tmp-name2)
+              (should
+               (string-equal
+                (make-auto-save-file-name)
+                ;; This is taken from Tramp.
+                (expand-file-name
+                 (format
+                  "#%s#"
+                  (tramp-subst-strs-in-string
+                   '(("_" . "|")
+                     ("/" . "_a")
+                     (":" . "_b")
+                     ("|" . "__")
+                     ("[" . "_l")
+                     ("]" . "_r"))
+                   tmp-name1))
+                 tmp-name2)))
+              (should (file-directory-p tmp-name2)))))
+      ;; Cleanup.
+      (ignore-errors (delete-file tmp-name1))
+      (ignore-errors (delete-directory tmp-name2 'recursive)))))
+(defun tramp--test-adb-p ()
+  "Check, whether the remote host runs Android.
+This requires restrictions of file name syntax."
+  (tramp-adb-file-name-p tramp-test-temporary-file-directory))
+(defun tramp--test-ftp-p ()
+  "Check, whether an FTP-like method is used.
+This does not support globbing characters in file names (yet)."
+  ;; Globbing characters are ??, ?* and ?\[.
+  (and (eq (tramp-find-foreign-file-name-handler
+            tramp-test-temporary-file-directory)
+           'tramp-sh-file-name-handler)
+       (string-match
+        "ftp$" (file-remote-p tramp-test-temporary-file-directory 'method))))
+(defun tramp--test-gvfs-p ()
+  "Check, whether the remote host runs a GVFS based method.
+This requires restrictions of file name syntax."
+  (tramp-gvfs-file-name-p tramp-test-temporary-file-directory))
+(defun tramp--test-smb-or-windows-nt-p ()
+  "Check, whether the locale or remote host runs MS Windows.
+This requires restrictions of file name syntax."
+  (or (eq system-type 'windows-nt)
+      (tramp-smb-file-name-p tramp-test-temporary-file-directory)))
+(defun tramp--test-hpux-p ()
+  "Check, whether the remote host runs HP-UX.
+Several special characters do not work properly there."
+  ;; We must refill the cache.  `file-truename' does it.
+  (with-parsed-tramp-file-name
+      (file-truename tramp-test-temporary-file-directory) nil
+    (string-match "^HP-UX" (tramp-get-connection-property v "uname" ""))))
+(defun tramp--test-check-files (&rest files)
+  "Run a simple but comprehensive test over every file in FILES."
+  ;; We must use `file-truename' for the temporary directory, because
+  ;; it could be located on a symlinked directory.  This would let the
+  ;; test fail.
+  (let* ((tramp-test-temporary-file-directory
+          (file-truename tramp-test-temporary-file-directory))
+         (tmp-name1 (tramp--test-make-temp-name))
+         (tmp-name2 (tramp--test-make-temp-name 'local))
+         (files (delq nil files)))
+    (unwind-protect
+        (progn
+          (make-directory tmp-name1)
+          (make-directory tmp-name2)
+          (dolist (elt files)
+            (let* ((file1 (expand-file-name elt tmp-name1))
+                   (file2 (expand-file-name elt tmp-name2))
+                   (file3 (expand-file-name (concat elt "foo") tmp-name1)))
+              (write-region elt nil file1)
+              (should (file-exists-p file1))
+              ;; Check file contents.
+              (with-temp-buffer
+                (insert-file-contents file1)
+                (should (string-equal (buffer-string) elt)))
+              ;; Copy file both directions.
+              (copy-file file1 tmp-name2)
+              (should (file-exists-p file2))
+              (delete-file file1)
+              (should-not (file-exists-p file1))
+              (copy-file file2 tmp-name1)
+              (should (file-exists-p file1))
+              ;; Method "smb" supports `make-symbolic-link' only if the
+              ;; remote host has CIFS capabilities.  tramp-adb.el and
+              ;; tramp-gvfs.el do not support symbolic links at all.
+              (condition-case err
+                  (progn
+                    (make-symbolic-link file1 file3)
+                    (should (file-symlink-p file3))
+                    (should
+                     (string-equal
+                      (expand-file-name file1) (file-truename file3)))
+                    (should
+                     (string-equal
+                      (car (file-attributes file3))
+                      (file-remote-p (file-truename file1) 'localname)))
+                    ;; Check file contents.
+                    (with-temp-buffer
+                      (insert-file-contents file3)
+                      (should (string-equal (buffer-string) elt)))
+                    (delete-file file3))
+                (file-error
+                 (should (string-equal (error-message-string err)
+                                       "make-symbolic-link not supported"))))))
+          ;; Check file names.
+          (should (equal (directory-files
+                          tmp-name1 nil directory-files-no-dot-files-regexp)
+                         (sort (copy-sequence files) 'string-lessp)))
+          (should (equal (directory-files
+                          tmp-name2 nil directory-files-no-dot-files-regexp)
+                         (sort (copy-sequence files) 'string-lessp)))
+          ;; `substitute-in-file-name' could return different values.
+          ;; For `adb', there could be strange file permissions
+          ;; preventing overwriting a file.  We don't care in this
+          ;; testcase.
+          (dolist (elt files)
+            (let ((file1
+                   (substitute-in-file-name (expand-file-name elt tmp-name1)))
+                  (file2
+                   (substitute-in-file-name (expand-file-name elt tmp-name2))))
+              (ignore-errors (write-region elt nil file1))
+              (should (file-exists-p file1))
+              (ignore-errors (write-region elt nil file2 nil 'nomessage))
+              (should (file-exists-p file2))))
+          (should (equal (directory-files
+                          tmp-name1 nil directory-files-no-dot-files-regexp)
+                         (directory-files
+                          tmp-name2 nil directory-files-no-dot-files-regexp)))
+          ;; Check directory creation.  We use a subdirectory "foo"
+          ;; in order to avoid conflicts with previous file name tests.
+          (dolist (elt files)
+            (let* ((elt1 (concat elt "foo"))
+                   (file1 (expand-file-name (concat "foo/" elt) tmp-name1))
+                   (file2 (expand-file-name elt file1))
+                   (file3 (expand-file-name elt1 file1)))
+              (make-directory file1 'parents)
+              (should (file-directory-p file1))
+              (write-region elt nil file2)
+              (should (file-exists-p file2))
+              (should
+               (equal
+                (directory-files file1 nil directory-files-no-dot-files-regexp)
+                `(,elt)))
+              (should
+               (equal
+                (caar (directory-files-and-attributes
+                       file1 nil directory-files-no-dot-files-regexp))
+                elt))
+              ;; Check symlink in `directory-files-and-attributes'.
+              (condition-case err
+                  (progn
+                    (make-symbolic-link file2 file3)
+                    (should (file-symlink-p file3))
+                    (should
+                     (string-equal
+                      (caar (directory-files-and-attributes
+                             file1 nil (regexp-quote elt1)))
+                      elt1))
+                    (should
+                     (string-equal
+                      (cadr (car (directory-files-and-attributes
+                                  file1 nil (regexp-quote elt1))))
+                      (file-remote-p (file-truename file2) 'localname)))
+                    (delete-file file3)
+                    (should-not (file-exists-p file3)))
+                (file-error
+                 (should (string-equal (error-message-string err)
+                                       "make-symbolic-link not supported"))))
+              (delete-file file2)
+              (should-not (file-exists-p file2))
+              (delete-directory file1)
+              (should-not (file-exists-p file1)))))
+      ;; Cleanup.
+      (ignore-errors (delete-directory tmp-name1 'recursive))
+      (ignore-errors (delete-directory tmp-name2 'recursive)))))
+(defun tramp--test-special-characters ()
+  "Perform the test in `tramp-test32-special-characters*'."
+  ;; Newlines, slashes and backslashes in file names are not
+  ;; supported.  So we don't test.  And we don't test the tab
+  ;; character on Windows or Cygwin, because the backslash is
+  ;; interpreted as a path separator, preventing "\t" from being
+  ;; expanded to <TAB>.
+  (tramp--test-check-files
+   (if (or (tramp--test-gvfs-p) (tramp--test-smb-or-windows-nt-p))
+       "foo bar baz"
+     (if (or (tramp--test-adb-p) (eq system-type 'cygwin))
+         " foo bar baz "
+       " foo\tbar baz\t"))
+   "$foo$bar$$baz$"
+   "-foo-bar-baz-"
+   "%foo%bar%baz%"
+   "&foo&bar&baz&"
+   (unless (or (tramp--test-ftp-p)
+               (tramp--test-gvfs-p)
+               (tramp--test-smb-or-windows-nt-p))
+     "?foo?bar?baz?")
+   (unless (or (tramp--test-ftp-p)
+               (tramp--test-gvfs-p)
+               (tramp--test-smb-or-windows-nt-p))
+     "*foo*bar*baz*")
+   (if (or (tramp--test-gvfs-p) (tramp--test-smb-or-windows-nt-p))
+       "'foo'bar'baz'"
+     "'foo\"bar'baz\"")
+   "#foo~bar#baz~"
+   (if (or (tramp--test-gvfs-p) (tramp--test-smb-or-windows-nt-p))
+       "!foo!bar!baz!"
+     "!foo|bar!baz|")
+   (if (or (tramp--test-gvfs-p) (tramp--test-smb-or-windows-nt-p))
+       ";foo;bar;baz;"
+     ":foo;bar:baz;")
+   (unless (or (tramp--test-gvfs-p) (tramp--test-smb-or-windows-nt-p))
+     "<foo>bar<baz>")
+   "(foo)bar(baz)"
+   (unless (or (tramp--test-ftp-p) (tramp--test-gvfs-p)) "[foo]bar[baz]")
+   "{foo}bar{baz}"))
+;; These tests are inspired by Bug#17238.
+(ert-deftest tramp-test32-special-characters ()
+  "Check special characters in file names."
+  (skip-unless (tramp--test-enabled))
+  (tramp--test-special-characters))
+(ert-deftest tramp-test32-special-characters-with-stat ()
+  "Check special characters in file names.
+Use the `stat' command."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
+    (skip-unless (tramp-get-remote-stat v)))
+  (let ((tramp-connection-properties
+         (append
+          `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "perl" nil))
+          tramp-connection-properties)))
+    (tramp--test-special-characters)))
+(ert-deftest tramp-test32-special-characters-with-perl ()
+  "Check special characters in file names.
+Use the `perl' command."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
+    (skip-unless (tramp-get-remote-perl v)))
+  (let ((tramp-connection-properties
+         (append
+          `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "stat" nil)
+            ;; See `tramp-sh-handle-file-truename'.
+            (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "readlink" nil))
+          tramp-connection-properties)))
+    (tramp--test-special-characters)))
+(ert-deftest tramp-test32-special-characters-with-ls ()
+  "Check special characters in file names.
+Use the `ls' command."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (let ((tramp-connection-properties
+         (append
+          `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "perl" nil)
+            (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "stat" nil)
+            ;; See `tramp-sh-handle-file-truename'.
+            (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "readlink" nil))
+          tramp-connection-properties)))
+    (tramp--test-special-characters)))
+(defun tramp--test-utf8 ()
+  "Perform the test in `tramp-test33-utf8*'."
+  (let* ((utf8 (if (and (eq system-type 'darwin)
+                        (memq 'utf-8-hfs (coding-system-list)))
+                   'utf-8-hfs 'utf-8))
+         (coding-system-for-read utf8)
+         (coding-system-for-write utf8)
+         (file-name-coding-system utf8))
+    (tramp--test-check-files
+     (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ")
+     (unless (tramp--test-hpux-p)
+       "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت")
+     "银河系漫游指南系列"
+     "Автостопом по гала́ктике")))
+(ert-deftest tramp-test33-utf8 ()
+  "Check UTF8 encoding in file names and file contents."
+  (skip-unless (tramp--test-enabled))
+  (tramp--test-utf8))
+(ert-deftest tramp-test33-utf8-with-stat ()
+  "Check UTF8 encoding in file names and file contents.
+Use the `stat' command."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
+    (skip-unless (tramp-get-remote-stat v)))
+  (let ((tramp-connection-properties
+         (append
+          `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "perl" nil))
+          tramp-connection-properties)))
+    (tramp--test-utf8)))
+(ert-deftest tramp-test33-utf8-with-perl ()
+  "Check UTF8 encoding in file names and file contents.
+Use the `perl' command."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
+    (skip-unless (tramp-get-remote-perl v)))
+  (let ((tramp-connection-properties
+         (append
+          `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "stat" nil)
+            ;; See `tramp-sh-handle-file-truename'.
+            (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "readlink" nil))
+          tramp-connection-properties)))
+    (tramp--test-utf8)))
+(ert-deftest tramp-test33-utf8-with-ls ()
+  "Check UTF8 encoding in file names and file contents.
+Use the `ls' command."
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  (let ((tramp-connection-properties
+         (append
+          `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "perl" nil)
+            (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "stat" nil)
+            ;; See `tramp-sh-handle-file-truename'.
+            (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
+             "readlink" nil))
+          tramp-connection-properties)))
+    (tramp--test-utf8)))
+;; This test is inspired by Bug#16928.
+(ert-deftest tramp-test34-asynchronous-requests ()
+  "Check parallel asynchronous requests.
+Such requests could arrive from timers, process filters and
+process sentinels.  They shall not disturb each other."
+  ;; Mark as failed until bug has been fixed.
+  :expected-result :failed
+  :tags '(:expensive-test)
+  (skip-unless (tramp--test-enabled))
+  (skip-unless
+   (eq
+    (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory)
+    'tramp-sh-file-name-handler))
+  ;; Keep instrumentation verbosity 0 until Tramp bug is fixed.  This
+  ;; has the side effect, that this test fails instead to abort.  Good
+  ;; for hydra.
+  (tramp--instrument-test-case 0
+  (let* ((tmp-name (tramp--test-make-temp-name))
+         (default-directory tmp-name)
+         (remote-file-name-inhibit-cache t)
+         timer buffers kill-buffer-query-functions)
+    (unwind-protect
+        (progn
+          (make-directory tmp-name)
+          ;; Setup a timer in order to raise an ordinary command again
+          ;; and again.  `vc-registered' is well suited, because there
+          ;; are many checks.
+          (setq
+           timer
+           (run-at-time
+            0 1
+            (lambda ()
+              (when buffers
+                (vc-registered
+                 (buffer-name (nth (random (length buffers)) buffers)))))))
+          ;; Create temporary buffers.  The number of buffers
+          ;; corresponds to the number of processes; it could be
+          ;; increased in order to make pressure on Tramp.
+          (dotimes (i 5)
+            (add-to-list 'buffers (generate-new-buffer "*temp*")))
+          ;; Open asynchronous processes.  Set process sentinel.
+          (dolist (buf buffers)
+            (async-shell-command "read line; touch $line; echo $line" buf)
+            (set-process-sentinel
+             (get-buffer-process buf)
+             (lambda (proc _state)
+               (delete-file (buffer-name (process-buffer proc))))))
+          ;; Send a string.  Use a random order of the buffers.  Mix
+          ;; with regular operation.
+          (let ((buffers (copy-sequence buffers))
+                buf)
+            (while buffers
+              (setq buf (nth (random (length buffers)) buffers))
+              (process-send-string
+               (get-buffer-process buf) (format "'%s'\n" buf))
+              (file-attributes (buffer-name buf))
+              (setq buffers (delq buf buffers))))
+          ;; Wait until the whole output has been read.
+          (with-timeout ((* 10 (length buffers))
+                         (ert-fail "`async-shell-command' timed out"))
+            (let ((buffers (copy-sequence buffers))
+                  buf)
+              (while buffers
+                (setq buf (nth (random (length buffers)) buffers))
+                (if (ignore-errors
+                      (memq (process-status (get-buffer-process buf))
+                            '(run open)))
+                    (accept-process-output (get-buffer-process buf) 0.1)
+                  (setq buffers (delq buf buffers))))))
+          ;; Check.
+          (dolist (buf buffers)
+            (with-current-buffer buf
+              (should
+               (string-equal (format "'%s'\n" buf) (buffer-string)))))
+          (should-not
+           (directory-files tmp-name nil directory-files-no-dot-files-regexp)))
+      ;; Cleanup.
+      (ignore-errors (cancel-timer timer))
+      (ignore-errors (delete-directory tmp-name 'recursive))
+      (dolist (buf buffers)
+        (ignore-errors (kill-buffer buf)))))))
+(ert-deftest tramp-test35-recursive-load ()
+  "Check that Tramp does not fail due to recursive load."
+  (skip-unless (tramp--test-enabled))
+  (dolist (code
+           (list
+            (format
+             "(expand-file-name %S)"
+             tramp-test-temporary-file-directory)
+            (format
+             "(let ((default-directory %S)) (expand-file-name %S))"
+             tramp-test-temporary-file-directory
+             temporary-file-directory)))
+    (should-not
+     (string-match
+      "Recursive load"
+      (shell-command-to-string
+       (format
+        "%s -batch -Q -L %s --eval %s"
+        (expand-file-name invocation-name invocation-directory)
+        (mapconcat 'shell-quote-argument load-path " -L ")
+        (shell-quote-argument code)))))))
+(ert-deftest tramp-test36-unload ()
+  "Check that Tramp and its subpackages unload completely.
+Since it unloads Tramp, it shall be the last test to run."
+  ;; Mark as failed until all symbols are unbound.
+  :expected-result (if (featurep 'tramp) :failed :passed)
+  :tags '(:expensive-test)
+  (when (featurep 'tramp)
+    (unload-feature 'tramp 'force)
+    ;; No Tramp feature must be left.
+    (should-not (featurep 'tramp))
+    (should-not (all-completions "tramp" (delq 'tramp-tests features)))
+    ;; `file-name-handler-alist' must be clean.
+    (should-not (all-completions "tramp" (mapcar 'cdr file-name-handler-alist)))
+    ;; There shouldn't be left a bound symbol.  We do not regard our
+    ;; test symbols, and the Tramp unload hooks.
+    (mapatoms
+     (lambda (x)
+       (and (or (boundp x) (functionp x))
+            (string-match "^tramp" (symbol-name x))
+            (not (string-match "^tramp--?test" (symbol-name x)))
+            (not (string-match "unload-hook$" (symbol-name x)))
+            (ert-fail (format "`%s' still bound" x)))))
+    ;; There shouldn't be left a hook function containing a Tramp
+    ;; function.  We do not regard the Tramp unload hooks.
+    (mapatoms
+     (lambda (x)
+       (and (boundp x)
+            (string-match "-hooks?$" (symbol-name x))
+            (not (string-match "unload-hook$" (symbol-name x)))
+            (consp (symbol-value x))
+            (ignore-errors (all-completions "tramp" (symbol-value x)))
+            (ert-fail (format "Hook `%s' still contains Tramp function" x)))))))
+;; TODO:
+;; * dired-compress-file
+;; * dired-uncache
+;; * file-acl
+;; * file-ownership-preserved-p
+;; * file-selinux-context
+;; * find-backup-file-name
+;; * set-file-acl
+;; * set-file-selinux-context
+;; * Work on skipped tests.  Make a comment, when it is impossible.
+;; * Fix `tramp-test15-copy-directory' for `smb'.  Using tar in a pipe
+;;   doesn't work well when an interactive password must be provided.
+;; * Fix `tramp-test27-start-file-process' on MS Windows (`process-send-eof'?).
+;; * Fix Bug#16928.  Set expected error of `tramp-test34-asynchronous-requests'.
+;; * Fix `tramp-test36-unload' (Not all symbols are unbound).  Set
+;;   expected error.
+(defun tramp-test-all (&optional interactive)
+  "Run all tests for \\[tramp]."
+  (interactive "p")
+  (funcall
+   (if interactive 'ert-run-tests-interactively 'ert-run-tests-batch) "^tramp"))
+(provide 'tramp-tests)
+;;; tramp-tests.el ends here
diff --git a/test/lisp/auth-source-tests.el b/test/lisp/auth-source-tests.el
index 5faa1fe20bf..e73f55e2bfa 100644
--- a/test/lisp/auth-source-tests.el
+++ b/test/lisp/auth-source-tests.el
@@ -1,6 +1,6 @@
 ;;; auth-source-tests.el --- Tests for auth-source.el  -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Damien Cassou <damien@cassou.me>,
 ;;         Nicolas Petton <nicolas@petton.fr>
diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el
index 2f951c0c9aa..aea855ae02f 100644
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -1,6 +1,6 @@
 ;;; auto-revert-tests.el --- Tests of auto-revert
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el
index c1fb1695c78..8f56d48d01d 100644
--- a/test/lisp/calc/calc-tests.el
+++ b/test/lisp/calc/calc-tests.el
@@ -1,6 +1,6 @@
 ;;; calc-tests.el --- tests for calc                 -*- lexical-binding: t; -*-
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; Author: Leo Liu <sdl.web@gmail.com>
 ;; Keywords: maint
diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el
index 307d687f2af..3e090029808 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -1,6 +1,6 @@
 ;; icalendar-tests.el --- Test suite for icalendar.el
-;; Copyright (C) 2005, 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc.
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        March 2005
diff --git a/test/lisp/char-fold-tests.el b/test/lisp/char-fold-tests.el
index 485254aa6cf..d86c731b6e3 100644
--- a/test/lisp/char-fold-tests.el
+++ b/test/lisp/char-fold-tests.el
@@ -1,6 +1,6 @@
 ;;; char-fold-tests.el --- Tests for char-fold.el  -*- lexical-binding: t; -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el
index 576be238408..3205c9e4cd3 100644
--- a/test/lisp/comint-tests.el
+++ b/test/lisp/comint-tests.el
@@ -1,6 +1,6 @@
 ;;; comint-testsuite.el
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/dabbrev-tests.el b/test/lisp/dabbrev-tests.el
index 9c7a8385535..5baa31558e7 100644
--- a/test/lisp/dabbrev-tests.el
+++ b/test/lisp/dabbrev-tests.el
@@ -1,6 +1,6 @@
 ;;; dabbrev-tests.el --- Test suite for dabbrev.
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
 ;; Author: Alan Third <alan@idiocy.org>
 ;; Keywords: dabbrev
diff --git a/test/lisp/descr-text-tests.el b/test/lisp/descr-text-tests.el
index 9e851c3a119..df0f8453161 100644
--- a/test/lisp/descr-text-tests.el
+++ b/test/lisp/descr-text-tests.el
@@ -1,6 +1,6 @@
 ;;; descr-text-test.el --- ERT tests for descr-text.el -*- lexical-binding: t -*-
-;; Copyright (C) 2014, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2016-2017 Free Software Foundation, Inc.
 ;; Author:     Michal Nazarewicz <mina86@mina86.com>
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 17b4e024ab2..78a37650619 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -1,6 +1,6 @@
 ;;; electric-tests.el --- tests for electric.el
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: João Távora <joaotavora@gmail.com>
 ;; Keywords:
diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el
index 91d438eae0f..bc47c82c1e1 100644
--- a/test/lisp/emacs-lisp/bytecomp-tests.el
+++ b/test/lisp/emacs-lisp/bytecomp-tests.el
@@ -1,6 +1,6 @@
 ;;; bytecomp-tests.el
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;; Author: Shigeru Fukaya <shigeru.fukaya@gmail.com>
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/test/lisp/emacs-lisp/cl-generic-tests.el b/test/lisp/emacs-lisp/cl-generic-tests.el
index dee10fe285e..0768e31f7e6 100644
--- a/test/lisp/emacs-lisp/cl-generic-tests.el
+++ b/test/lisp/emacs-lisp/cl-generic-tests.el
@@ -1,6 +1,6 @@
 ;;; cl-generic-tests.el --- Tests for cl-generic.el functionality  -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/test/lisp/emacs-lisp/cl-lib-tests.el b/test/lisp/emacs-lisp/cl-lib-tests.el
index cbaf70fc4bb..5edc3e72bf2 100644
--- a/test/lisp/emacs-lisp/cl-lib-tests.el
+++ b/test/lisp/emacs-lisp/cl-lib-tests.el
@@ -1,6 +1,6 @@
 ;;; cl-lib.el --- tests for emacs-lisp/cl-lib.el  -*- lexical-binding:t -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
index eb26047da2f..09edea461d1 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
@@ -1,6 +1,6 @@
 ;;; eieio-testsinvoke.el -- eieio tests for method invocation
-;; Copyright (C) 2005, 2008, 2010, 2013-2016 Free Software Foundation,
+;; Copyright (C) 2005, 2008, 2010, 2013-2017 Free Software Foundation,
 ;; Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
index 2f8d65e512e..da4cc5f51f3 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
@@ -1,6 +1,6 @@
 ;;; eieio-persist.el --- Tests for eieio-persistent class
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
index 9665beb490e..db601abbd0a 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
@@ -1,6 +1,6 @@
 ;;; eieio-tests.el -- eieio tests routines
-;; Copyright (C) 1999-2003, 2005-2010, 2012-2016 Free Software
+;; Copyright (C) 1999-2003, 2005-2010, 2012-2017 Free Software
 ;; Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el
index 83fddd15165..fc5790c3659 100644
--- a/test/lisp/emacs-lisp/ert-tests.el
+++ b/test/lisp/emacs-lisp/ert-tests.el
@@ -1,6 +1,6 @@
 ;;; ert-tests.el --- ERT's self-tests  -*- lexical-binding: t -*-
-;; Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc.
 ;; Author: Christian Ohler <ohler@gnu.org>
diff --git a/test/lisp/emacs-lisp/ert-x-tests.el b/test/lisp/emacs-lisp/ert-x-tests.el
index ef8642aebfb..4615d08e303 100644
--- a/test/lisp/emacs-lisp/ert-x-tests.el
+++ b/test/lisp/emacs-lisp/ert-x-tests.el
@@ -1,6 +1,6 @@
 ;;; ert-x-tests.el --- Tests for ert-x.el
-;; Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc.
 ;; Author: Phil Hagelberg
 ;;         Christian Ohler <ohler@gnu.org>
diff --git a/test/lisp/emacs-lisp/generator-tests.el b/test/lisp/emacs-lisp/generator-tests.el
index 8ed0f2a240d..1a567ac70fc 100644
--- a/test/lisp/emacs-lisp/generator-tests.el
+++ b/test/lisp/emacs-lisp/generator-tests.el
@@ -1,6 +1,6 @@
 ;;; generator-tests.el --- Testing generators -*- lexical-binding: t -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Daniel Colascione <dancol@dancol.org>
 ;; Keywords:
diff --git a/test/lisp/emacs-lisp/let-alist-tests.el b/test/lisp/emacs-lisp/let-alist-tests.el
index 657a27a67dc..fbcde4e3cbf 100644
--- a/test/lisp/emacs-lisp/let-alist-tests.el
+++ b/test/lisp/emacs-lisp/let-alist-tests.el
@@ -1,6 +1,6 @@
 ;;; let-alist.el --- tests for file handling. -*- lexical-binding: t; -*-
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/map-tests.el b/test/lisp/emacs-lisp/map-tests.el
index 0af1c656e09..07e85cc5391 100644
--- a/test/lisp/emacs-lisp/map-tests.el
+++ b/test/lisp/emacs-lisp/map-tests.el
@@ -1,6 +1,6 @@
 ;;; map-tests.el --- Tests for map.el  -*- lexical-binding:t -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/test/lisp/emacs-lisp/nadvice-tests.el b/test/lisp/emacs-lisp/nadvice-tests.el
index cd51599b86a..b228da6cdb8 100644
--- a/test/lisp/emacs-lisp/nadvice-tests.el
+++ b/test/lisp/emacs-lisp/nadvice-tests.el
@@ -1,6 +1,6 @@
 ;;; advice-tests.el --- Test suite for the new advice thingy.
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index 3d2801e3d70..2e4666e7fe3 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -1,6 +1,6 @@
 ;;; package-test.el --- Tests for the Emacs package system
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Daniel Hackney <dan@haxney.org>
 ;; Version: 1.0
diff --git a/test/lisp/emacs-lisp/pcase-tests.el b/test/lisp/emacs-lisp/pcase-tests.el
index a428e4092f1..ef0b2f6b246 100644
--- a/test/lisp/emacs-lisp/pcase-tests.el
+++ b/test/lisp/emacs-lisp/pcase-tests.el
@@ -1,6 +1,6 @@
 ;;; pcase-tests.el --- Test suite for pcase macro.
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emacs-lisp/regexp-opt-tests.el b/test/lisp/emacs-lisp/regexp-opt-tests.el
index 01119a3374f..92626317052 100644
--- a/test/lisp/emacs-lisp/regexp-opt-tests.el
+++ b/test/lisp/emacs-lisp/regexp-opt-tests.el
@@ -1,6 +1,6 @@
 ;;; regexp-tests.el --- Test suite for regular expression handling.
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:       internal
diff --git a/test/lisp/emacs-lisp/seq-tests.el b/test/lisp/emacs-lisp/seq-tests.el
index a7a43471de3..788524bedb5 100644
--- a/test/lisp/emacs-lisp/seq-tests.el
+++ b/test/lisp/emacs-lisp/seq-tests.el
@@ -1,6 +1,6 @@
 ;;; seq-tests.el --- Tests for sequences.el
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/test/lisp/emacs-lisp/subr-x-tests.el b/test/lisp/emacs-lisp/subr-x-tests.el
index e30b5d8f549..2b2a5cd0d71 100644
--- a/test/lisp/emacs-lisp/subr-x-tests.el
+++ b/test/lisp/emacs-lisp/subr-x-tests.el
@@ -1,6 +1,6 @@
 ;;; subr-x-tests.el --- Testing the extended lisp routines
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; Author: Fabián E. Gallina <fgallina@gnu.org>
 ;; Keywords:
diff --git a/test/lisp/emacs-lisp/tabulated-list-test.el b/test/lisp/emacs-lisp/tabulated-list-test.el
index 0fb8dee7fd1..b3a09ee375c 100644
--- a/test/lisp/emacs-lisp/tabulated-list-test.el
+++ b/test/lisp/emacs-lisp/tabulated-list-test.el
@@ -1,6 +1,6 @@
 ;;; tabulated-list-test.el --- Tests for emacs-lisp/tabulated-list.el  -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
diff --git a/test/lisp/emacs-lisp/thunk-tests.el b/test/lisp/emacs-lisp/thunk-tests.el
index f995d362c7d..89bf1f50113 100644
--- a/test/lisp/emacs-lisp/thunk-tests.el
+++ b/test/lisp/emacs-lisp/thunk-tests.el
@@ -1,6 +1,6 @@
 ;;; thunk-tests.el --- Tests for thunk.el -*- lexical-binding: t -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Nicolas Petton <nicolas@petton.fr>
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/test/lisp/emacs-lisp/timer-tests.el b/test/lisp/emacs-lisp/timer-tests.el
index e3cdec73232..b12a365ff3b 100644
--- a/test/lisp/emacs-lisp/timer-tests.el
+++ b/test/lisp/emacs-lisp/timer-tests.el
@@ -1,6 +1,6 @@
 ;;; timer-tests.el --- tests for timers -*- lexical-binding:t -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/emulation/viper-tests.el b/test/lisp/emulation/viper-tests.el
index 2c63b24fae0..67ce5b6fbb0 100644
--- a/test/lisp/emulation/viper-tests.el
+++ b/test/lisp/emulation/viper-tests.el
@@ -1,6 +1,6 @@
 ;;; viper-tests.el --- tests for viper.
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
index d51ab23f71e..ea2b62c3584 100644
--- a/test/lisp/epg-tests.el
+++ b/test/lisp/epg-tests.el
@@ -1,6 +1,6 @@
 ;;; epg-tests.el --- Test suite for epg.el -*- lexical-binding: t -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/eshell/eshell.el b/test/lisp/eshell/eshell.el
index d5676dd1daf..dee6c17e025 100644
--- a/test/lisp/eshell/eshell.el
+++ b/test/lisp/eshell/eshell.el
@@ -1,6 +1,6 @@
 ;;; tests/eshell.el --- Eshell test suite
-;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2017 Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
diff --git a/test/lisp/faces-tests.el b/test/lisp/faces-tests.el
index 809ba24d210..a30ba25f8f0 100644
--- a/test/lisp/faces-tests.el
+++ b/test/lisp/faces-tests.el
@@ -1,6 +1,6 @@
 ;;; faces-tests.el --- Tests for faces.el            -*- lexical-binding: t; -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 ;; Keywords:
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index bd7f191dac6..2c085b34de9 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -1,6 +1,6 @@
 ;;; filenotify-tests.el --- Tests of file notifications  -*- lexical-binding: t; -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 6fbe993bfdd..9d456c512b0 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1,6 +1,6 @@
 ;;; files-tests.el --- tests for files.el.
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/gnus/gnus-tests.el b/test/lisp/gnus/gnus-tests.el
index 6801ce69a3e..47c49b38c42 100644
--- a/test/lisp/gnus/gnus-tests.el
+++ b/test/lisp/gnus/gnus-tests.el
@@ -1,6 +1,6 @@
 ;;; gnus-tests.el --- Wrapper for the Gnus tests
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
diff --git a/test/lisp/gnus/message-tests.el b/test/lisp/gnus/message-tests.el
index 13c15e33b27..40367251420 100644
--- a/test/lisp/gnus/message-tests.el
+++ b/test/lisp/gnus/message-tests.el
@@ -1,6 +1,6 @@
 ;;; message-mode-tests.el --- Tests for message-mode  -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: João Távora <joaotavora@gmail.com>
diff --git a/test/lisp/imenu-tests.el b/test/lisp/imenu-tests.el
index b6e0f604d0e..480368fcbb6 100644
--- a/test/lisp/imenu-tests.el
+++ b/test/lisp/imenu-tests.el
@@ -1,6 +1,6 @@
 ;;; imenu-tests.el --- Test suite for imenu.
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Masatake YAMATO <yamato@redhat.com>
 ;; Keywords: tools convenience
diff --git a/test/lisp/info-xref-tests.el b/test/lisp/info-xref-tests.el
index bc3115042bc..9ae07c33fd9 100644
--- a/test/lisp/info-xref-tests.el
+++ b/test/lisp/info-xref-tests.el
@@ -1,6 +1,6 @@
 ;;; info-xref.el --- tests for info-xref.el
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/international/mule-util-tests.el b/test/lisp/international/mule-util-tests.el
index 9846aa13295..356ee33232f 100644
--- a/test/lisp/international/mule-util-tests.el
+++ b/test/lisp/international/mule-util-tests.el
@@ -1,6 +1,6 @@
 ;;; mule-util --- tests for international/mule-util.el
-;; Copyright (C) 2002-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/isearch-tests.el b/test/lisp/isearch-tests.el
index 52f312d0b97..e5cae8237e1 100644
--- a/test/lisp/isearch-tests.el
+++ b/test/lisp/isearch-tests.el
@@ -1,6 +1,6 @@
 ;;; isearch-tests.el --- Tests for isearch.el        -*- lexical-binding: t; -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el
index 78cebb45eed..66fc25ad1c0 100644
--- a/test/lisp/json-tests.el
+++ b/test/lisp/json-tests.el
@@ -1,6 +1,6 @@
 ;;; json-tests.el --- Test suite for json.el
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
diff --git a/test/lisp/mail/rmail-tests.el b/test/lisp/mail/rmail-tests.el
index 2f18372146a..6cf9053bc0d 100644
--- a/test/lisp/mail/rmail-tests.el
+++ b/test/lisp/mail/rmail-tests.el
@@ -1,6 +1,6 @@
 ;;; rmail-tests.el --- Test suite. -*- lexical-binding: t -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/man-tests.el b/test/lisp/man-tests.el
index b1cc4437256..b9f47f50c20 100644
--- a/test/lisp/man-tests.el
+++ b/test/lisp/man-tests.el
@@ -1,6 +1,6 @@
 ;;; man-tests.el --- Test suite for man.
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Wolfgang Jenkner <wjenkner@inode.at>
 ;; Keywords: help, internal, unix
diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el
index 0f2abf45673..efed8f8bed4 100644
--- a/test/lisp/minibuffer-tests.el
+++ b/test/lisp/minibuffer-tests.el
@@ -1,6 +1,6 @@
 ;;; completion-tests.el --- Tests for completion functions  -*- lexical-binding: t; -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 12be1637109..525709b92e7 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -1,6 +1,6 @@
 ;;; dbus-tests.el --- Tests of D-Bus integration into Emacs
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
diff --git a/test/lisp/net/newsticker-tests.el b/test/lisp/net/newsticker-tests.el
index d8531083e60..56064f781de 100644
--- a/test/lisp/net/newsticker-tests.el
+++ b/test/lisp/net/newsticker-tests.el
@@ -1,6 +1,6 @@
 ;;; newsticker-testsuite.el --- Test suite for newsticker.
-;; Copyright (C) 2003-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2017 Free Software Foundation, Inc.
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Keywords:    News, RSS, Atom
diff --git a/test/lisp/net/sasl-scram-rfc-tests.el b/test/lisp/net/sasl-scram-rfc-tests.el
index 130de240481..96cec77c56d 100644
--- a/test/lisp/net/sasl-scram-rfc-tests.el
+++ b/test/lisp/net/sasl-scram-rfc-tests.el
@@ -1,6 +1,6 @@
 ;;; sasl-scram-rfc-tests.el --- tests for SCRAM-SHA-1       -*- lexical-binding: t; -*-
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; Author: Magnus Henoch <magnus.henoch@gmail.com>
diff --git a/test/lisp/obarray-tests.el b/test/lisp/obarray-tests.el
index 92345b7198e..9a2d65d8b41 100644
--- a/test/lisp/obarray-tests.el
+++ b/test/lisp/obarray-tests.el
@@ -1,6 +1,6 @@
 ;;; obarray-tests.el --- Tests for obarray -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Przemysław Wojnowski <esperanto@cumego.com>
diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el
index 9f61c20fd5e..5c8c9c2a81f 100644
--- a/test/lisp/progmodes/compile-tests.el
+++ b/test/lisp/progmodes/compile-tests.el
@@ -1,6 +1,6 @@
 ;;; compile-tests.el --- Test suite for compile.el.  -*- lexical-binding: t; -*-
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
index 12e61cf8d18..93c428b2d2b 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -1,6 +1,6 @@
 ;;; elisp-mode-tests.el --- Tests for emacs-lisp-mode  -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
diff --git a/test/lisp/progmodes/f90.el b/test/lisp/progmodes/f90.el
index 29c608847f1..cda39eda376 100644
--- a/test/lisp/progmodes/f90.el
+++ b/test/lisp/progmodes/f90.el
@@ -1,6 +1,6 @@
 ;;; f90.el --- tests for progmodes/f90.el
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Glenn Morris <rgm@gnu.org>
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 386516190bb..9bf6e7aa178 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -1,6 +1,6 @@
 ;;; flymake-tests.el --- Test suite for flymake
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Eduard Wiebe <usenet@pusto.de>
diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index f6564dd58cc..94c356b589e 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -1,6 +1,6 @@
 ;;; python-tests.el --- Test suite for python.el
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/progmodes/ruby-mode-tests.el b/test/lisp/progmodes/ruby-mode-tests.el
index 97f277bff41..f04483f6d7c 100644
--- a/test/lisp/progmodes/ruby-mode-tests.el
+++ b/test/lisp/progmodes/ruby-mode-tests.el
@@ -1,6 +1,6 @@
 ;;; ruby-mode-tests.el --- Test suite for ruby-mode
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/progmodes/subword-tests.el b/test/lisp/progmodes/subword-tests.el
index 5a562765bb1..39512efdbe1 100644
--- a/test/lisp/progmodes/subword-tests.el
+++ b/test/lisp/progmodes/subword-tests.el
@@ -1,6 +1,6 @@
 ;;; subword-tests.el --- Testing the subword rules
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords:
diff --git a/test/lisp/progmodes/xref-tests.el b/test/lisp/progmodes/xref-tests.el
index 2b745816c62..b7f0f0526c6 100644
--- a/test/lisp/progmodes/xref-tests.el
+++ b/test/lisp/progmodes/xref-tests.el
@@ -1,6 +1,6 @@
 ;;; xref-tests.el --- tests for xref
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index 2b71348f350..adef5a3f3dc 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -1,6 +1,6 @@
 ;;; replace-tests.el --- tests for replace.el.
-;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
 ;; Author: Nicolas Richard <youngfrog@members.fsf.org>
 ;; Author: Juri Linkov <juri@jurta.org>
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index d022240ae5c..6194cada1c6 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -1,6 +1,6 @@
 ;;; simple-test.el --- Tests for simple.el           -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
diff --git a/test/lisp/sort-tests.el b/test/lisp/sort-tests.el
index f3a182cdc14..f6cbe90d5bf 100644
--- a/test/lisp/sort-tests.el
+++ b/test/lisp/sort-tests.el
@@ -1,6 +1,6 @@
 ;;; sort-tests.el --- Tests for sort.el              -*- lexical-binding: t; -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index 82a70ca072b..3c5dbcdbd76 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -1,6 +1,6 @@
 ;;; subr-tests.el --- Tests for subr.el
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>,
 ;;         Nicolas Petton <nicolas@petton.fr>
diff --git a/test/lisp/textmodes/reftex-tests.el b/test/lisp/textmodes/reftex-tests.el
index 12ec7f5a394..55db66c58dc 100644
--- a/test/lisp/textmodes/reftex-tests.el
+++ b/test/lisp/textmodes/reftex-tests.el
@@ -1,6 +1,6 @@
 ;;; reftex-tests.el --- Test suite for reftex. -*- lexical-binding: t -*-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
 ;; Keywords:       internal
diff --git a/test/lisp/textmodes/sgml-mode-tests.el b/test/lisp/textmodes/sgml-mode-tests.el
index 4184e2c3802..e1aa3e8857e 100644
--- a/test/lisp/textmodes/sgml-mode-tests.el
+++ b/test/lisp/textmodes/sgml-mode-tests.el
@@ -1,6 +1,6 @@
 ;;; sgml-mode-tests.el --- Tests for sgml-mode
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Przemysław Wojnowski <esperanto@cumego.com>
 ;; Keywords: tests
diff --git a/test/lisp/textmodes/tildify-tests.el b/test/lisp/textmodes/tildify-tests.el
index 8b50cf72868..0a82b2521fb 100644
--- a/test/lisp/textmodes/tildify-tests.el
+++ b/test/lisp/textmodes/tildify-tests.el
@@ -1,6 +1,6 @@
 ;;; tildify-test.el --- ERT tests for tildify.el -*- lexical-binding: t -*-
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; Author:     Michal Nazarewicz <mina86@mina86.com>
 ;; Version:    4.5
diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el
index 6d73d9001ae..d4449eacbf9 100644
--- a/test/lisp/thingatpt-tests.el
+++ b/test/lisp/thingatpt-tests.el
@@ -1,6 +1,6 @@
 ;;; thingatpt.el --- tests for thing-at-point.
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/lisp/url/url-expand-tests.el b/test/lisp/url/url-expand-tests.el
index 6d1d54d4ffc..2debbdeb753 100644
--- a/test/lisp/url/url-expand-tests.el
+++ b/test/lisp/url/url-expand-tests.el
@@ -1,6 +1,6 @@
 ;;; url-expand-tests.el --- Test suite for relative URI/URL resolution.
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; Author: Alain Schneble <a.s@realize.ch>
 ;; Version: 1.0
diff --git a/test/lisp/url/url-future-tests.el b/test/lisp/url/url-future-tests.el
index 87298cc1b96..64d045219ba 100644
--- a/test/lisp/url/url-future-tests.el
+++ b/test/lisp/url/url-future-tests.el
@@ -1,6 +1,6 @@
 ;;; url-future-tests.el --- Test suite for url-future.
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: data
diff --git a/test/lisp/url/url-parse-tests.el b/test/lisp/url/url-parse-tests.el
index 77c5320e351..05da7280aa2 100644
--- a/test/lisp/url/url-parse-tests.el
+++ b/test/lisp/url/url-parse-tests.el
@@ -1,6 +1,6 @@
 ;;; url-parse-tests.el --- Test suite for URI/URL parsing.
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; Author: Alain Schneble <a.s@realize.ch>
 ;; Version: 1.0
diff --git a/test/lisp/url/url-util-tests.el b/test/lisp/url/url-util-tests.el
index 2f1de5103d6..c3375890c01 100644
--- a/test/lisp/url/url-util-tests.el
+++ b/test/lisp/url/url-util-tests.el
@@ -1,6 +1,6 @@
 ;;; url-util-tests.el --- Test suite for url-util.
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: data
diff --git a/test/lisp/vc/add-log-tests.el b/test/lisp/vc/add-log-tests.el
index 71be5a9eadc..3e7bc7fdf0d 100644
--- a/test/lisp/vc/add-log-tests.el
+++ b/test/lisp/vc/add-log-tests.el
@@ -1,6 +1,6 @@
 ;;; add-log-tests.el --- Test suite for add-log.
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Masatake YAMATO <yamato@redhat.com>
 ;; Keywords: vc tools
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index f27e6588cf2..fc7d8f8283f 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -1,6 +1,6 @@
 ;;; vc-bzr.el --- tests for vc/vc-bzr.el
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Glenn Morris <rgm@gnu.org>
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/test/lisp/vc/vc-hg.el b/test/lisp/vc/vc-hg.el
index ba966598c4d..8e4c9739e08 100644
--- a/test/lisp/vc/vc-hg.el
+++ b/test/lisp/vc/vc-hg.el
@@ -1,6 +1,6 @@
 ;;; vc-hg.el --- tests for vc/vc-hg.el
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
 ;; Author: Dmitry Gutov <dgutov@yandex.ru>
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index b54a45dd323..ad4399db032 100644
--- a/test/lisp/vc/vc-tests.el
+++ b/test/lisp/vc/vc-tests.el
@@ -1,6 +1,6 @@
 ;;; vc-tests.el --- Tests of different backends of vc.el
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
diff --git a/test/lisp/xml-tests.el b/test/lisp/xml-tests.el
index 488d2c6f920..0f2182a6a75 100644
--- a/test/lisp/xml-tests.el
+++ b/test/lisp/xml-tests.el
@@ -1,6 +1,6 @@
 ;;; xml-parse-tests.el --- Test suite for XML parsing.
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/lisp/xt-mouse-tests.el b/test/lisp/xt-mouse-tests.el
index c7e835c0311..c0e97f57479 100644
--- a/test/lisp/xt-mouse-tests.el
+++ b/test/lisp/xt-mouse-tests.el
@@ -1,6 +1,6 @@
 ;;; xt-mouse-tests.el --- Test suite for xt-mouse.  -*- lexical-binding: t; -*-
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
 ;; Author: Philipp Stephani <phst@google.com>
diff --git a/test/manual/biditest.el b/test/manual/biditest.el
index c1a575017f8..c315749e187 100644
--- a/test/manual/biditest.el
+++ b/test/manual/biditest.el
@@ -1,6 +1,6 @@
 ;;; biditest.el --- test bidi reordering in GNU Emacs display engine.
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Eli Zaretskii
 ;; Maintainer: emacs-devel@gnu.org
diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index ae9d576f0f5..b8396b822b9 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -1,6 +1,6 @@
 ;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/ede-tests.el b/test/manual/cedet/ede-tests.el
index 32971e441ef..fdad01c1ff1 100644
--- a/test/manual/cedet/ede-tests.el
+++ b/test/manual/cedet/ede-tests.el
@@ -1,6 +1,6 @@
 ;;; ede-tests.el --- Some tests for the Emacs Development Environment
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/semantic-ia-utest.el b/test/manual/cedet/semantic-ia-utest.el
index a5b70b8326f..cf89daf1490 100644
--- a/test/manual/cedet/semantic-ia-utest.el
+++ b/test/manual/cedet/semantic-ia-utest.el
@@ -1,6 +1,6 @@
 ;;; semantic-ia-utest.el --- Analyzer unit tests
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/semantic-tests.el b/test/manual/cedet/semantic-tests.el
index 179851fafeb..bfcba7e6772 100644
--- a/test/manual/cedet/semantic-tests.el
+++ b/test/manual/cedet/semantic-tests.el
@@ -1,6 +1,6 @@
 ;;; semantic-utest.el --- Miscellaneous Semantic tests.
-;;; Copyright (C) 2003-2004, 2007-2016 Free Software Foundation, Inc.
+;;; Copyright (C) 2003-2004, 2007-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/test/manual/cedet/semantic-utest-c.el b/test/manual/cedet/semantic-utest-c.el
index ec09b96211f..26ce4009277 100644
--- a/test/manual/cedet/semantic-utest-c.el
+++ b/test/manual/cedet/semantic-utest-c.el
@@ -1,6 +1,6 @@
 ;;; semantic-utest-c.el --- C based parsing tests.
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/semantic-utest.el b/test/manual/cedet/semantic-utest.el
index d26d6118d2d..f735e552413 100644
--- a/test/manual/cedet/semantic-utest.el
+++ b/test/manual/cedet/semantic-utest.el
@@ -1,6 +1,6 @@
 ;;; semantic-utest.el --- Tests for semantic's parsing system.
-;;; Copyright (C) 2003-2004, 2007-2016 Free Software Foundation, Inc.
+;;; Copyright (C) 2003-2004, 2007-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/test/manual/cedet/srecode-tests.el b/test/manual/cedet/srecode-tests.el
index 18beb9291fa..36256a70597 100644
--- a/test/manual/cedet/srecode-tests.el
+++ b/test/manual/cedet/srecode-tests.el
@@ -1,6 +1,6 @@
 ;;; srecode-tests.el --- Some tests for CEDET's srecode
-;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/test.c b/test/manual/cedet/tests/test.c
index 0aa8852b8a9..a46486927a7 100644
--- a/test/manual/cedet/tests/test.c
+++ b/test/manual/cedet/tests/test.c
@@ -1,6 +1,6 @@
 /* test.c --- Semantic unit test for C.
-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2017 Free Software Foundation, Inc.
   Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/test.el b/test/manual/cedet/tests/test.el
index 15517da0dc2..a0efd40acce 100644
--- a/test/manual/cedet/tests/test.el
+++ b/test/manual/cedet/tests/test.el
@@ -1,6 +1,6 @@
 ;;; test.el --- Unit test file for Semantic Emacs Lisp support.
-;; Copyright (C) 2005-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2017 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/test.make b/test/manual/cedet/tests/test.make
index 1eb71f7ccc8..46421da54d6 100644
--- a/test/manual/cedet/tests/test.make
+++ b/test/manual/cedet/tests/test.make
@@ -1,6 +1,6 @@
 # test.make --- Semantic unit test for Make -*- makefile -*-
-# Copyright (C) 2001-2002, 2010-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2010-2017 Free Software Foundation, Inc.
 # Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testdoublens.cpp b/test/manual/cedet/tests/testdoublens.cpp
index 63c4deedd08..e9a6ba52673 100644
--- a/test/manual/cedet/tests/testdoublens.cpp
+++ b/test/manual/cedet/tests/testdoublens.cpp
@@ -1,6 +1,6 @@
 // testdoublens.cpp --- semantic-ia-utest completion engine unit tests
-// Copyright (C) 2008-2016 Free Software Foundation, Inc.
+// Copyright (C) 2008-2017 Free Software Foundation, Inc.
 // Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testdoublens.hpp b/test/manual/cedet/tests/testdoublens.hpp
index 6d2a0f0755e..556f068d586 100644
--- a/test/manual/cedet/tests/testdoublens.hpp
+++ b/test/manual/cedet/tests/testdoublens.hpp
@@ -1,6 +1,6 @@
 // testdoublens.hpp --- Header file used in one of the Semantic tests
-// Copyright (C) 2008-2016 Free Software Foundation, Inc.
+// Copyright (C) 2008-2017 Free Software Foundation, Inc.
 // Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testjavacomp.java b/test/manual/cedet/tests/testjavacomp.java
index f0abfc97b06..c32a17ca248 100644
--- a/test/manual/cedet/tests/testjavacomp.java
+++ b/test/manual/cedet/tests/testjavacomp.java
@@ -1,6 +1,6 @@
 //  testjavacomp.java --- Semantic unit test for Java
-// Copyright (C) 2009-2016 Free Software Foundation, Inc.
+// Copyright (C) 2009-2017 Free Software Foundation, Inc.
 //  Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testpolymorph.cpp b/test/manual/cedet/tests/testpolymorph.cpp
index 94ae9d90413..27aa08b155b 100644
--- a/test/manual/cedet/tests/testpolymorph.cpp
+++ b/test/manual/cedet/tests/testpolymorph.cpp
@@ -1,6 +1,6 @@
 /** testpolymorph.cpp --- A sequence of polymorphism examples.
 *
- * Copyright (C) 2009-2016 Free Software Foundation, Inc.
+ * Copyright (C) 2009-2017 Free Software Foundation, Inc.
 *
 * Author: Eric M. Ludlam <eric@siege-engine.com>
 *
diff --git a/test/manual/cedet/tests/testspp.c b/test/manual/cedet/tests/testspp.c
index cfb3996db47..02eab53afb6 100644
--- a/test/manual/cedet/tests/testspp.c
+++ b/test/manual/cedet/tests/testspp.c
@@ -1,6 +1,6 @@
 /* testspp.cpp --- Semantic unit test for the C preprocessor
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
   Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testsppreplace.c b/test/manual/cedet/tests/testsppreplace.c
index fbbaa75fee1..56ef320f752 100644
--- a/test/manual/cedet/tests/testsppreplace.c
+++ b/test/manual/cedet/tests/testsppreplace.c
@@ -1,5 +1,5 @@
 /* testsppreplace.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
   Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testsppreplaced.c b/test/manual/cedet/tests/testsppreplaced.c
index 8cbe05bd4f7..3ba90aa4ddb 100644
--- a/test/manual/cedet/tests/testsppreplaced.c
+++ b/test/manual/cedet/tests/testsppreplaced.c
@@ -1,5 +1,5 @@
 /* testsppreplaced.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007-2017 Free Software Foundation, Inc.
   Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testsubclass.cpp b/test/manual/cedet/tests/testsubclass.cpp
index 2cb9e763888..e74ca43124a 100644
--- a/test/manual/cedet/tests/testsubclass.cpp
+++ b/test/manual/cedet/tests/testsubclass.cpp
@@ -1,6 +1,6 @@
 // testsubclass.cpp --- unit test for analyzer and complex C++ inheritance
-// Copyright (C) 2007-2016 Free Software Foundation, Inc.
+// Copyright (C) 2007-2017 Free Software Foundation, Inc.
 // Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testsubclass.hh b/test/manual/cedet/tests/testsubclass.hh
index 7c93f8ec02d..6f199c20bd3 100644
--- a/test/manual/cedet/tests/testsubclass.hh
+++ b/test/manual/cedet/tests/testsubclass.hh
@@ -1,6 +1,6 @@
 // testsubclass.hh --- unit test for analyzer and complex C++ inheritance
-// Copyright (C) 2007-2016 Free Software Foundation, Inc.
+// Copyright (C) 2007-2017 Free Software Foundation, Inc.
 // Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testtypedefs.cpp b/test/manual/cedet/tests/testtypedefs.cpp
index 312a77f0058..e6c91f736bf 100644
--- a/test/manual/cedet/tests/testtypedefs.cpp
+++ b/test/manual/cedet/tests/testtypedefs.cpp
@@ -1,6 +1,6 @@
 // testtypedefs.cpp --- Sample with some fake bits out of std::string
-// Copyright (C) 2008-2016 Free Software Foundation, Inc.
+// Copyright (C) 2008-2017 Free Software Foundation, Inc.
 // Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/cedet/tests/testvarnames.c b/test/manual/cedet/tests/testvarnames.c
index 419361d1dbc..dbc4afb46ba 100644
--- a/test/manual/cedet/tests/testvarnames.c
+++ b/test/manual/cedet/tests/testvarnames.c
@@ -1,7 +1,7 @@
 /* testvarnames.cpp
   Test variable and function names, lists of variables on one line, etc.
-   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
   Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/test/manual/etags/c-src/abbrev.c b/test/manual/etags/c-src/abbrev.c
index b7d137cd9bd..c01eee419ff 100644
--- a/test/manual/etags/c-src/abbrev.c
+++ b/test/manual/etags/c-src/abbrev.c
@@ -1,5 +1,5 @@
 /* Primitives for word-abbrev mode.
-   Copyright (C) 1985-1986, 1993, 1996, 1998, 2016 Free Software
+   Copyright (C) 1985-1986, 1993, 1996, 1998, 2016-2017 Free Software
   Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/test/manual/etags/c-src/emacs/src/gmalloc.c b/test/manual/etags/c-src/emacs/src/gmalloc.c
index 683ee0c9502..79b2040e321 100644
--- a/test/manual/etags/c-src/emacs/src/gmalloc.c
+++ b/test/manual/etags/c-src/emacs/src/gmalloc.c
@@ -1,5 +1,5 @@
 /* Declarations for `malloc' and friends.
-   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2016 Free
+   Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2017 Free
   Software Foundation, Inc.
                  Written May 1989 by Mike Haertel.
diff --git a/test/manual/etags/c-src/emacs/src/keyboard.c b/test/manual/etags/c-src/emacs/src/keyboard.c
index 68584ee71fc..5a651497d73 100644
--- a/test/manual/etags/c-src/emacs/src/keyboard.c
+++ b/test/manual/etags/c-src/emacs/src/keyboard.c
@@ -1,6 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
-Copyright (C) 1985-1989, 1993-1997, 1999-2016 Free Software Foundation,
+Copyright (C) 1985-1989, 1993-1997, 1999-2017 Free Software Foundation,
 Inc.
 This file is part of GNU Emacs.
diff --git a/test/manual/etags/c-src/emacs/src/lisp.h b/test/manual/etags/c-src/emacs/src/lisp.h
index db8722917ea..688589624fe 100644
--- a/test/manual/etags/c-src/emacs/src/lisp.h
+++ b/test/manual/etags/c-src/emacs/src/lisp.h
@@ -1,6 +1,6 @@
 /* Fundamental definitions for GNU Emacs Lisp interpreter.
-Copyright (C) 1985-1987, 1993-1995, 1997-2016 Free Software Foundation,
+Copyright (C) 1985-1987, 1993-1995, 1997-2017 Free Software Foundation,
 Inc.
 This file is part of GNU Emacs.
diff --git a/test/manual/etags/c-src/emacs/src/regex.h b/test/manual/etags/c-src/emacs/src/regex.h
index f97c1cb38c1..2ed6238730f 100644
--- a/test/manual/etags/c-src/emacs/src/regex.h
+++ b/test/manual/etags/c-src/emacs/src/regex.h
@@ -1,7 +1,7 @@
 /* Definitions for data structures and routines for the regular
   expression library, version 0.12.
-   Copyright (C) 1985, 1989-1993, 1995, 2000-2016 Free Software
+   Copyright (C) 1985, 1989-1993, 1995, 2000-2017 Free Software
   Foundation, Inc.
   This program is free software; you can redistribute it and/or modify
diff --git a/test/manual/etags/c-src/etags.c b/test/manual/etags/c-src/etags.c
index 453419897bc..e8321f05ff4 100644
--- a/test/manual/etags/c-src/etags.c
+++ b/test/manual/etags/c-src/etags.c
@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2016 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2017 Free Software
 Foundation, Inc.
 This file is not considered part of GNU Emacs.
diff --git a/test/manual/etags/c-src/exit.c b/test/manual/etags/c-src/exit.c
index 86afda9ed01..b1952bfddb9 100644
--- a/test/manual/etags/c-src/exit.c
+++ b/test/manual/etags/c-src/exit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 2016 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 2016-2017 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 The GNU C Library is free software; you can redistribute it and/or
diff --git a/test/manual/etags/c-src/exit.strange_suffix b/test/manual/etags/c-src/exit.strange_suffix
index 86afda9ed01..b1952bfddb9 100644
--- a/test/manual/etags/c-src/exit.strange_suffix
+++ b/test/manual/etags/c-src/exit.strange_suffix
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 2016 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 2016-2017 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 The GNU C Library is free software; you can redistribute it and/or
diff --git a/test/manual/etags/c-src/getopt.h b/test/manual/etags/c-src/getopt.h
index aa2eb1dc173..aa66fac4ecd 100644
--- a/test/manual/etags/c-src/getopt.h
+++ b/test/manual/etags/c-src/getopt.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1992, 2016 Free Software Foundation, Inc.
+   Copyright (C) 1989-1992, 2016-2017 Free Software Foundation, Inc.
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
diff --git a/test/manual/etags/c-src/sysdep.h b/test/manual/etags/c-src/sysdep.h
index 6409fcc1e1d..2c121cf53a9 100644
--- a/test/manual/etags/c-src/sysdep.h
+++ b/test/manual/etags/c-src/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-1993, 2016 Free Software Foundation, Inc.
+/* Copyright (C) 1992-1993, 2016-2017 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 The GNU C Library is free software; you can redistribute it and/or
diff --git a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
index 5d28657e28b..955859803df 100644
--- a/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
+++ b/test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
@@ -1,6 +1,6 @@
 ;;; etags.el --- etags facility for Emacs  -*- lexical-binding: t -*-
-;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2016 Free
+;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2017 Free
 ;; Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
diff --git a/test/manual/etags/tex-src/texinfo.tex b/test/manual/etags/tex-src/texinfo.tex
index aa745c68471..e98f24cda69 100644
--- a/test/manual/etags/tex-src/texinfo.tex
+++ b/test/manual/etags/tex-src/texinfo.tex
@@ -1,6 +1,6 @@
 %% TeX macros to handle texinfo files
-%   Copyright (C) 1985-1986, 1988, 1990-1991, 2016 Free Software
+%   Copyright (C) 1985-1986, 1988, 1990-1991, 2016-2017 Free Software
 %   Foundation, Inc.
 %This texinfo.tex file is free software; you can redistribute it and/or
diff --git a/test/manual/etags/y-src/cccp.c b/test/manual/etags/y-src/cccp.c
index 022fbe0a72f..380243c6fa4 100644
--- a/test/manual/etags/y-src/cccp.c
+++ b/test/manual/etags/y-src/cccp.c
@@ -320,7 +320,7 @@ static const short yycheck[] =
 #line 3 "/usr/share/bison/bison.simple"
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989-1990, 2000-2001, 2016 Free Software
+   Copyright (C) 1984, 1989-1990, 2000-2001, 2016-2017 Free Software
   Foundation, Inc.
   This program is free software; you can redistribute it and/or modify
diff --git a/test/manual/etags/y-src/parse.c b/test/manual/etags/y-src/parse.c
index d21af68b9bb..f8d836e649d 100644
--- a/test/manual/etags/y-src/parse.c
+++ b/test/manual/etags/y-src/parse.c
@@ -28,7 +28,8 @@
 #line 1 "y-src/parse.y"
-/*      Copyright (C) 1990, 1992-1993, 2016 Free Software Foundation, Inc.
+/*      Copyright (C) 1990, 1992-1993, 2016-2017 Free Software Foundation,
+ *      Inc.
 This file is part of Oleo, the GNU Spreadsheet.
diff --git a/test/manual/etags/y-src/parse.y b/test/manual/etags/y-src/parse.y
index 824c98d6245..b40847dd559 100644
--- a/test/manual/etags/y-src/parse.y
+++ b/test/manual/etags/y-src/parse.y
@@ -1,5 +1,6 @@
 %{
-/*      Copyright (C) 1990, 1992-1993, 2016 Free Software Foundation, Inc.
+/*      Copyright (C) 1990, 1992-1993, 2016-2017 Free Software Foundation,
+ *      Inc.
 This file is part of Oleo, the GNU Spreadsheet.
diff --git a/test/manual/indent/pascal.pas b/test/manual/indent/pascal.pas
index 2d09eb775a4..fd225fd35d1 100644
--- a/test/manual/indent/pascal.pas
+++ b/test/manual/indent/pascal.pas
@@ -1,6 +1,6 @@
 { GPC demo program for the CRT unit.
-Copyright (C) 1999-2006, 2013-2016 Free Software Foundation, Inc.
+Copyright (C) 1999-2006, 2013-2017 Free Software Foundation, Inc.
 Author: Frank Heckenbach <frank@pascal.gnu.de>
diff --git a/test/manual/redisplay-testsuite.el b/test/manual/redisplay-testsuite.el
index 37a5649dc1b..694d55ab1db 100644
--- a/test/manual/redisplay-testsuite.el
+++ b/test/manual/redisplay-testsuite.el
@@ -1,6 +1,6 @@
 ;;; redisplay-testsuite.el --- Test suite for redisplay.
-;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/manual/rmailmm.el b/test/manual/rmailmm.el
index 96acbc4735e..fc570fa42b4 100644
--- a/test/manual/rmailmm.el
+++ b/test/manual/rmailmm.el
@@ -1,6 +1,6 @@
 ;;; rmailmm.el --- tests for mail/rmailmm.el
-;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/src/alloc-tests.el b/test/src/alloc-tests.el
index 97c6b4f8070..af4ad6c6355 100644
--- a/test/src/alloc-tests.el
+++ b/test/src/alloc-tests.el
@@ -1,6 +1,6 @@
 ;;; alloc-tests.el --- alloc tests -*- lexical-binding: t -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Daniel Colascione <dancol@dancol.org>
 ;; Keywords:
diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 62875216a31..793dddd8bd4 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1,6 +1,6 @@
 ;;; buffer-tests.el --- tests for buffer.c functions -*- lexical-binding: t -*-
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/src/cmds-tests.el b/test/src/cmds-tests.el
index 4a30d9872a1..207ae75a21d 100644
--- a/test/src/cmds-tests.el
+++ b/test/src/cmds-tests.el
@@ -1,6 +1,6 @@
 ;;; cmds-tests.el --- Testing some Emacs commands
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Nicolas Richard <youngfrog@members.fsf.org>
 ;; Keywords:
diff --git a/test/src/coding-tests.el b/test/src/coding-tests.el
index bd494bc26f8..cfcd080281f 100644
--- a/test/src/coding-tests.el
+++ b/test/src/coding-tests.el
@@ -1,6 +1,6 @@
 ;;; coding-tests.el --- tests for text encoding and decoding
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Eli Zaretskii <eliz@gnu.org>
 ;; Author: Kenichi Handa <handa@gnu.org>
diff --git a/test/src/decompress-tests.el b/test/src/decompress-tests.el
index f0264ec548d..eaec0d01a7b 100644
--- a/test/src/decompress-tests.el
+++ b/test/src/decompress-tests.el
@@ -1,6 +1,6 @@
 ;;; decompress-tests.el --- Test suite for decompress.
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; Author: Lars Ingebrigtsen <larsi@gnus.org>
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index c533bad3cdc..ee3c5dc77e4 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -1,6 +1,6 @@
 ;;; fns-tests.el --- tests for src/fns.c
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/src/font-tests.el b/test/src/font-tests.el
index f0f0d31efc7..dc48577025c 100644
--- a/test/src/font-tests.el
+++ b/test/src/font-tests.el
@@ -1,6 +1,6 @@
 ;;; font-tests.el --- Test suite for font-related functions.
-;; Copyright (C) 2011-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 ;; Author: Chong Yidong <cyd@stupidchicken.com>
 ;; Keywords:       internal
diff --git a/test/src/inotify-tests.el b/test/src/inotify-tests.el
index 54977925f86..f30aecc9c4f 100644
--- a/test/src/inotify-tests.el
+++ b/test/src/inotify-tests.el
@@ -1,6 +1,6 @@
 ;;; inotify-tests.el --- Test suite for inotify. -*- lexical-binding: t -*-
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; Author: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
 ;; Keywords:       internal
diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el
index 26d34858703..c5b9d0cc71c 100644
--- a/test/src/keymap-tests.el
+++ b/test/src/keymap-tests.el
@@ -1,6 +1,6 @@
 ;;; keymap-tests.el --- Test suite for src/keymap.c
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Juanma Barranquero <lekktu@gmail.com>
diff --git a/test/src/print-tests.el b/test/src/print-tests.el
index 1abfa53581c..b3ffc23e120 100644
--- a/test/src/print-tests.el
+++ b/test/src/print-tests.el
@@ -1,6 +1,6 @@
 ;;; print-tests.el --- tests for src/print.c         -*- lexical-binding: t; -*-
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 8cc59bf9feb..04dc903f3a9 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -1,6 +1,6 @@
 ;;; process-tests.el --- Testing the process facilities
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
diff --git a/test/src/textprop-tests.el b/test/src/textprop-tests.el
index ceb48d1b2db..d4c8925b5db 100644
--- a/test/src/textprop-tests.el
+++ b/test/src/textprop-tests.el
@@ -1,6 +1,6 @@
 ;;; textprop-tests.el --- Test suite for text properties.
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 ;; Author: Wolfgang Jenkner <wjenkner@inode.at>
 ;; Keywords: internal
diff --git a/test/src/undo-tests.el b/test/src/undo-tests.el
index b1c786993e8..fbd3bf84a42 100644
--- a/test/src/undo-tests.el
+++ b/test/src/undo-tests.el
@@ -1,6 +1,6 @@
 ;;; undo-tests.el --- Tests of primitive-undo
-;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2017 Free Software Foundation, Inc.
 ;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com>
diff --git a/test/src/xml-tests.el b/test/src/xml-tests.el
index dc60197b59e..1550887f77d 100644
--- a/test/src/xml-tests.el
+++ b/test/src/xml-tests.el
@@ -1,6 +1,6 @@
 ;;; libxml-parse-tests.el --- Test suite for libxml parsing.
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc.
 ;; Author: Ulf Jasper <ulf.jasper@web.de>
 ;; Keywords:       internal
author	Paul Eggert	2017-01-01 01:10:47 -0800
committer	Paul Eggert	2017-01-01 01:10:47 -0800
commit	bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch)
tree	dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /test
parent	772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff)
parent	2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff)
download	emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip