Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

23 files changed, 1061 insertions, 56 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 2e8364e1d2a..9ccb1f4bc89 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,7 +1,64 @@
+2013-06-28  Kenichi Handa  <handa@gnu.org>
+
+        * automated/decoder-tests.el (decoder-tests-gen-file): New arg FILE.
+        (decoder-tests-ao-gen-file): Renamed from decoder-tests-filename.
+        Callers changed.
+        (decoder-tests-filename): New function.
+        (decoder-tests-prefer-utf-8-read)
+        (decoder-tests-prefer-utf-8-write): New function.
+        (ert-test-decoder-prefer-utf-8): New test.
+
+2013-06-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/package-x-test.el: Change the commentary.
+        (package-x-test--single-archive-entry-1-3)
+        (package-x-test--single-archive-entry-1-4): Fix the tests, by
+        using the appropriate data structure.
+
+2013-06-27  Daniel Hackney  <dan@haxney.org>
+
+        * automated/Makefile.in (setwins): Include the 'data' subdirectory.
+
+        * automated/package-x-test.el: New file.
+
+        * automated/package-test.el: New file.
+
+        * automated/data/package: New directory, with test examples.
+
+2013-06-27  Glenn Morris  <rgm@gnu.org>
+
+        * automated/python-tests.el (python-tests-with-temp-file):
+        Clean up after ourself.
+
+        * automated/undo-tests.el (undo-test3): Remove test that seems to
+        do nothing that the previous one doesn't, except leave a tempfile.
+
+2013-06-26  Glenn Morris  <rgm@gnu.org>
+
+        * automated/info-xref.el: New file.
+
+2013-06-25  Glenn Morris  <rgm@gnu.org>
+
+        * automated/occur-tests.el (occur-test-create): New function.
+        Use it to create separate tests for each element, so we run them
+        all rather than stopping at the first error.
+
+2013-06-24  Glenn Morris  <rgm@fencepost.gnu.org>
+
+        * automated/occur-tests.el (occur-tests):
+        Update for 2013-05-29 change to occur header line.
+
+2013-06-21  Eduard Wiebe  <usenet@pusto.de>
+
+        Test suite for flymake.
+        * automated/flymake-tests.el:
+        * automated/flymake/warnpred/Makefile
+        * automated/flymake/warnpred/test.c
+        * automated/flymake/warnpred/test.pl: New files.
+
 2013-06-12  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-        * automated/reftex-tests.el (reftex-parse-from-file-test): Fix
-        test.
+        * automated/reftex-tests.el (reftex-parse-from-file-test): Fix test.
 
 2013-06-12  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 1a4e3c9b1ea..6e7111e589c 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -50,7 +50,7 @@ emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT)
 # Common command to find subdirectories
 setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
-           case $$file in */.* | */.*/* | */=* ) ;; \
+           case $$file in */.* | */.*/* | */=* | ./data* ) ;; \
                 *) wins="$$wins $$file" ;; \
            esac; \
         done
diff --git a/test/automated/data/package/archive-contents b/test/automated/data/package/archive-contents
new file mode 100644
index 00000000000..7e4a410030f
--- /dev/null
+++ b/test/automated/data/package/archive-contents
@@ -0,0 +1,10 @@
+(1
+ (simple-single .
+                [(1 3)
+                 nil "A single-file package with no dependencies" single])
+ (simple-depend .
+                [(1 0)
+                 ((simple-single (1 3))) "A single-file package with a dependency." single])
+ (multi-file .
+             [(0 2 3)
+              nil "Example of a multi-file tar package" tar]))
diff --git a/test/automated/data/package/multi-file-0.2.3.tar b/test/automated/data/package/multi-file-0.2.3.tar
new file mode 100644
index 00000000000..bdbbab0e6f4
--- /dev/null
+++ b/test/automated/data/package/multi-file-0.2.3.tar
diff --git a/test/automated/data/package/multi-file-readme.txt b/test/automated/data/package/multi-file-readme.txt
new file mode 100644
index 00000000000..affd2e96fb0
--- /dev/null
+++ b/test/automated/data/package/multi-file-readme.txt
@@ -0,0 +1 @@
+This is a bare-bones readme file for the multi-file package.
diff --git a/test/automated/data/package/newer-versions/archive-contents b/test/automated/data/package/newer-versions/archive-contents
new file mode 100644
index 00000000000..add5f2909d0
--- /dev/null
+++ b/test/automated/data/package/newer-versions/archive-contents
@@ -0,0 +1,13 @@
+(1
+ (simple-single .
+                [(1 4)
+                 nil "A single-file package with no dependencies" single])
+ (simple-depend .
+                [(1 0)
+                 ((simple-single (1 3))) "A single-file package with a dependency." single])
+ (new-pkg .
+                [(1 0)
+                 nil "A package only seen after "updating" archive-contents" single])
+ (multi-file .
+             [(0 2 3)
+              nil "Example of a multi-file tar package" tar]))
diff --git a/test/automated/data/package/newer-versions/new-pkg-1.0.el b/test/automated/data/package/newer-versions/new-pkg-1.0.el
new file mode 100644
index 00000000000..7251622fa59
--- /dev/null
+++ b/test/automated/data/package/newer-versions/new-pkg-1.0.el
@@ -0,0 +1,18 @@
+;;; new-pkg.el --- A package only seen after "updating" archive-contents
+
+;; Author: J. R. Hacker <jrh@example.com>
+;; Version: 1.0
+
+;;; Commentary:
+
+;; This will only show up after updating "archive-contents".
+
+;;; Code:
+
+(defun new-pkg-frob ()
+  "Ignore me."
+  (ignore))
+
+(provide 'new-pkg)
+
+;;; new-pkg.el ends here
diff --git a/test/automated/data/package/newer-versions/simple-single-1.4.el b/test/automated/data/package/newer-versions/simple-single-1.4.el
new file mode 100644
index 00000000000..7d8178c05a5
--- /dev/null
+++ b/test/automated/data/package/newer-versions/simple-single-1.4.el
@@ -0,0 +1,36 @@
+;;; simple-single.el --- A single-file package with no dependencies
+
+;; Author: J. R. Hacker <jrh@example.com>
+;; Version: 1.4
+;; Keywords: frobnicate
+
+;;; Commentary:
+
+;; This package provides a minor mode to frobnicate and/or bifurcate
+;; any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
+;; and all your dreams will come true.
+;;
+;; This is a new, updated version.
+
+;;; Code:
+
+(defgroup simple-single nil "Simply a file"
+  :group 'lisp)
+
+(defcustom simple-single-super-sunday nil
+  "How great is this?
+Default changed to `nil'."
+  :type 'boolean
+  :group 'simple-single
+  :package-version "1.4")
+
+(defvar simple-single-sudo-sandwich nil
+  "Make a sandwich?")
+
+;;;###autoload
+(define-minor-mode simple-single-mode
+  "It does good things to stuff")
+
+(provide 'simple-single)
+
+;;; simple-single.el ends here
diff --git a/test/automated/data/package/simple-depend-1.0.el b/test/automated/data/package/simple-depend-1.0.el
new file mode 100644
index 00000000000..b58b658d024
--- /dev/null
+++ b/test/automated/data/package/simple-depend-1.0.el
@@ -0,0 +1,17 @@
+;;; simple-depend.el --- A single-file package with a dependency.
+
+;; Author: J. R. Hacker <jrh@example.com>
+;; Version: 1.0
+;; Keywords: frobnicate
+;; Package-Requires: ((simple-single "1.3"))
+
+;;; Commentary:
+
+;; Depends on another package.
+
+;;; Code:
+
+(defvar simple-depend "Value"
+  "Some trivial code")
+
+;;; simple-depend.el ends here
diff --git a/test/automated/data/package/simple-single-1.3.el b/test/automated/data/package/simple-single-1.3.el
new file mode 100644
index 00000000000..a61784164f8
--- /dev/null
+++ b/test/automated/data/package/simple-single-1.3.el
@@ -0,0 +1,32 @@
+;;; simple-single.el --- A single-file package with no dependencies
+
+;; Author: J. R. Hacker <jrh@example.com>
+;; Version: 1.3
+;; Keywords: frobnicate
+
+;;; Commentary:
+
+;; This package provides a minor mode to frobnicate and/or bifurcate
+;; any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
+;; and all your dreams will come true.
+
+;;; Code:
+
+(defgroup simple-single nil "Simply a file"
+  :group 'lisp)
+
+(defcustom simple-single-super-sunday t
+  "How great is this?"
+  :type 'boolean
+  :group 'simple-single)
+
+(defvar simple-single-sudo-sandwich nil
+  "Make a sandwich?")
+
+;;;###autoload
+(define-minor-mode simple-single-mode
+  "It does good things to stuff")
+
+(provide 'simple-single)
+
+;;; simple-single.el ends here
diff --git a/test/automated/data/package/simple-single-readme.txt b/test/automated/data/package/simple-single-readme.txt
new file mode 100644
index 00000000000..25d3034032b
--- /dev/null
+++ b/test/automated/data/package/simple-single-readme.txt
@@ -0,0 +1,3 @@
+This package provides a minor mode to frobnicate and/or bifurcate
+any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
+and all your dreams will come true.
diff --git a/test/automated/decoder-tests.el b/test/automated/decoder-tests.el
index 055626491c0..e1b05faf3c0 100644
--- a/test/automated/decoder-tests.el
+++ b/test/automated/decoder-tests.el
@@ -23,12 +23,14 @@
 
 (require 'ert)
 
-;;; Check ASCII optimizing decoder
-
 ;; Directory to hold test data files.
 (defvar decoder-tests-workdir
   (expand-file-name "decoder-tests" temporary-file-directory))
 
+;; Remove all generated test files.
+(defun decoder-tests-remove-files ()
+  (delete-directory decoder-tests-workdir t))
+
 ;; Return the contents (specified by CONTENT-TYPE; ascii, latin, or
 ;; binary) of a test file.
 (defun decoder-tests-file-contents (content-type)
@@ -43,25 +45,16 @@
           (t
            (error "Invalid file content type: %s" content-type)))))
 
-;; Return the name of test file whose contents specified by
-;; CONTENT-TYPE and whose encoding specified by CODING-SYSTEM.
-(defun decoder-tests-filename (content-type coding-system)
-  (expand-file-name (format "%s-%s" content-type coding-system)
-                    decoder-tests-workdir))
-
-;; Generate a test file whose contents specified by CONTENT-TYPE and
+;; Generate FILE with CONTENTS encoded by CODING-SYSTEM.
 ;; whose encoding specified by CODING-SYSTEM.
-(defun decoder-tests-gen-file (content-type coding-system)
+(defun decoder-tests-gen-file (file contents coding-system)
   (or (file-directory-p decoder-tests-workdir)
       (mkdir decoder-tests-workdir t))
-  (let ((file (decoder-tests-filename content-type coding-system)))
-    (with-temp-file file
-      (set-buffer-file-coding-system coding-system)
-      (insert (decoder-tests-file-contents content-type)))))
-
-;; Remove all generated test files.
-(defun decoder-tests-remove-files ()
-  (delete-directory decoder-tests-workdir t))
+  (setq file (expand-file-name file decoder-tests-workdir))
+  (with-temp-file file
+    (set-buffer-file-coding-system coding-system)
+    (insert contents))
+  file)
 
 ;;; The following three functions are filters for contents of a test
 ;;; file.
@@ -96,6 +89,26 @@
 (defun decoder-tests-add-bom (str)
   (concat "\xfeff" str))
 
+;; Return the name of test file whose contents specified by
+;; CONTENT-TYPE and whose encoding specified by CODING-SYSTEM.
+(defun decoder-tests-filename (content-type coding-system &optional ext)
+  (if ext
+      (expand-file-name (format "%s-%s.%s" content-type coding-system ext)
+                        decoder-tests-workdir)
+    (expand-file-name (format "%s-%s" content-type coding-system)
+                      decoder-tests-workdir)))
+
+
+;;; Check ASCII optimizing decoder
+
+;; Generate a test file whose contents specified by CONTENT-TYPE and
+;; whose encoding specified by CODING-SYSTEM.
+(defun decoder-tests-ao-gen-file (content-type coding-system)
+  (let ((file (decoder-tests-filename content-type coding-system)))
+    (decoder-tests-gen-file file 
+                            (decoder-tests-file-contents content-type)
+                            coding-system)))
+
 ;; Test the decoding of a file whose contents and encoding are
 ;; specified by CONTENT-TYPE and WRITE-CODING.  The test passes if the
 ;; file is read by READ-CODING and detected as DETECTED-CODING and the
@@ -127,7 +140,7 @@
   (unwind-protect
       (progn
         (dolist (eol-type '(unix dos mac))
-          (decoder-tests-gen-file 'ascii eol-type))
+          (decoder-tests-ao-gen-file 'ascii eol-type))
         (should-not (decoder-tests 'ascii 'unix 'undecided 'unix))
         (should-not (decoder-tests 'ascii 'dos 'undecided 'dos))
         (should-not (decoder-tests 'ascii 'dos 'dos 'dos))
@@ -147,8 +160,8 @@
       (progn
         (dolist (coding '("utf-8" "utf-8-with-signature"))
           (dolist (eol-type '("unix" "dos" "mac"))
-            (decoder-tests-gen-file 'latin
-                                    (intern (concat coding "-" eol-type)))))
+            (decoder-tests-ao-gen-file 'latin
+                                       (intern (concat coding "-" eol-type)))))
         (should-not (decoder-tests 'latin 'utf-8-unix 'undecided 'utf-8-unix))
         (should-not (decoder-tests 'latin 'utf-8-unix 'utf-8-unix 'utf-8-unix))
         (should-not (decoder-tests 'latin 'utf-8-dos 'undecided 'utf-8-dos))
@@ -177,8 +190,8 @@
   (unwind-protect
       (progn
         (dolist (eol-type '("unix" "dos" "mac"))
-          (decoder-tests-gen-file 'binary
-                                  (intern (concat "raw-text" "-" eol-type))))
+          (decoder-tests-ao-gen-file 'binary
+                                     (intern (concat "raw-text" "-" eol-type))))
         (should-not (decoder-tests 'binary 'raw-text-unix 'undecided
                                    'raw-text-unix))
         (should-not (decoder-tests 'binary 'raw-text-dos 'undecided
@@ -193,6 +206,64 @@
                                    'raw-text-mac 'decoder-tests-lf-to-lflf)))
     (decoder-tests-remove-files)))
 
+
+;;; Check the coding system `prefer-utf-8'.
+
+;; Read FILE.  Check if the encoding was detected as DETECT.  If
+;; PREFER is non-nil, prefer that coding system before reading.
+
+(defun decoder-tests-prefer-utf-8-read (file detect prefer)
+  (if prefer
+      (prefer-coding-system prefer))
+  (with-temp-buffer
+    (insert-file-contents file)
+    (if (eq buffer-file-coding-system detect)
+        nil
+      (format "Invalid detection: %s" buffer-file-coding-system))))
+
+;; Read FILE, modify it, and write it.  Check if the coding system
+;; used for writing was CODING.  If CODING-TAG is non-nil, insert
+;; coding tag with it before writing.  If STR is non-nil, insert it
+;; before writing.
+
+(defun decoder-tests-prefer-utf-8-write (file coding-tag coding
+                                              &optional str)
+  (with-temp-buffer
+    (insert-file-contents file)
+    (goto-char (point-min))
+    (if coding-tag
+        (insert (format ";; -*- coding: %s; -*-\n" coding-tag))
+      (insert ";;\n"))
+    (if str
+        (insert str))
+    (write-file (decoder-tests-filename 'test 'test "el"))
+    (if (coding-system-equal buffer-file-coding-system coding)
+        nil
+      (format "Incorrect encoding: %s" last-coding-system-used))))
+
+(ert-deftest ert-test-decoder-prefer-utf-8 ()
+  (unwind-protect
+      (let ((ascii (decoder-tests-gen-file "ascii.el"
+                                           (decoder-tests-file-contents 'ascii)
+                                           'unix))
+            (latin (decoder-tests-gen-file "utf-8.el"
+                                           (decoder-tests-file-contents 'latin)
+                                           'utf-8)))
+        (should-not (decoder-tests-prefer-utf-8-read
+                     ascii 'prefer-utf-8-unix nil))
+        (should-not (decoder-tests-prefer-utf-8-read
+                     latin 'utf-8-unix nil))
+        (should-not (decoder-tests-prefer-utf-8-read
+                     latin 'utf-8-unix 'iso-8859-1))
+        (should-not (decoder-tests-prefer-utf-8-read
+                     latin 'utf-8-unix 'sjis))
+        (should-not (decoder-tests-prefer-utf-8-write
+                     ascii nil 'prefer-utf-8-unix))
+        (should-not (decoder-tests-prefer-utf-8-write
+                     ascii 'iso-8859-1 'iso-8859-1-unix))
+        (should-not (decoder-tests-prefer-utf-8-write
+                     ascii nil 'utf-8-unix "À")))
+    (decoder-tests-remove-files)))
 
 
 ;;; The following is for benchmark testing of the new optimized
diff --git a/test/automated/flymake-tests.el b/test/automated/flymake-tests.el
new file mode 100644
index 00000000000..9cc87b608ad
--- /dev/null
+++ b/test/automated/flymake-tests.el
@@ -0,0 +1,82 @@
+;;; flymake-tests.el --- Test suite for flymake
+
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
+
+;; Author: Eduard Wiebe <usenet@pusto.de>
+
+;; 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 'flymake)
+
+(defgroup flymake-tests nil
+  "Test suite for flymake.")
+
+
+;; Warning predicate
+(defun flymake-tests--current-face (file predicate)
+  (let ((buffer (find-file-noselect file)))
+    (unwind-protect
+        (with-current-buffer (find-file-noselect file)
+          (setq-local flymake-warning-predicate predicate)
+          (goto-char (point-min))
+          (flymake-mode 1)
+          ;; XXX: is this reliable enough?
+          (sleep-for (+ 0.5 flymake-no-changes-timeout))
+          (flymake-goto-next-error)
+          (face-at-point))
+      (and buffer (kill-buffer buffer)))))
+
+(ert-deftest warning-predicate-rx-gcc ()
+  "Test GCC warning via regexp predicate."
+  :expected-result (if (executable-find "gcc") :passed :failed)
+  (should (eq 'flymake-warnline
+              (flymake-tests--current-face
+               "flymake/warnpred/test.c"
+               "^[Ww]arning"))))
+
+(ert-deftest warning-predicate-function-gcc ()
+  "Test GCC warning via function predicate."
+  :expected-result (if (and (executable-find "gcc") (executable-find "make"))
+                       :passed
+                     :failed)
+  (should (eq 'flymake-warnline
+              (flymake-tests--current-face
+               "flymake/warnpred/test.c"
+               (lambda (msg) (string-match "^[Ww]arning" msg))))))
+
+(ert-deftest warning-predicate-rx-perl ()
+  "Test perl warning via regular expression predicate."
+  :expected-result (if (executable-find "perl") :passed :failed)
+  (should (eq 'flymake-warnline
+              (flymake-tests--current-face
+               "flymake/warnpred/test.pl"
+               "^Scalar value"))))
+
+(ert-deftest warning-predicate-function-perl ()
+  "Test perl warning via function predicate."
+  :expected-result (if (executable-find "perl") :passed :failed)
+  (should (eq 'flymake-warnline
+              (flymake-tests--current-face
+               "flymake/warnpred/test.pl"
+               (lambda (msg) (string-match "^Scalar value" msg))))))
+
+(provide 'flymake-tests)
+
+;;; flymake.el ends here
diff --git a/test/automated/flymake/warnpred/Makefile b/test/automated/flymake/warnpred/Makefile
new file mode 100644
index 00000000000..33af51c3337
--- /dev/null
+++ b/test/automated/flymake/warnpred/Makefile
@@ -0,0 +1,8 @@
+# Makefile for flymake tests
+
+CC_OPTS = -Wall
+
+check-syntax:
+        $(CC) $(CC_OPTS) ${CHK_SOURCES}
+
+# eof
diff --git a/test/automated/flymake/warnpred/test.c b/test/automated/flymake/warnpred/test.c
new file mode 100644
index 00000000000..3a3926131f5
--- /dev/null
+++ b/test/automated/flymake/warnpred/test.c
@@ -0,0 +1,5 @@
+int main()
+{
+  char c = 1000;
+  return c;
+}
diff --git a/test/automated/flymake/warnpred/test.pl b/test/automated/flymake/warnpred/test.pl
new file mode 100644
index 00000000000..2013b2e4434
--- /dev/null
+++ b/test/automated/flymake/warnpred/test.pl
@@ -0,0 +1,2 @@
+@arr = [1,2,3,4];
+@arr[1] = -1;
diff --git a/test/automated/info-xref.el b/test/automated/info-xref.el
new file mode 100644
index 00000000000..973af0d46c7
--- /dev/null
+++ b/test/automated/info-xref.el
@@ -0,0 +1,148 @@
+;;; info-xref.el --- tests for info-xref.el
+
+;; Copyright (C) 2013 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 'ert)
+(require 'info-xref)
+
+(defun info-xref-test-internal (body result)
+  "Body of a basic info-xref ert test.
+BODY is a string from an info buffer.
+RESULT is a list (NBAD NGOOD NUNAVAIL)."
+  (get-buffer-create info-xref-output-buffer)
+  (setq info-xref-xfile-alist nil)
+  (require 'info)
+  (let ((Info-directory-list '("."))
+        Info-additional-directory-list)
+    (info-xref-with-output
+     (with-temp-buffer
+       (insert body)
+       (info-xref-check-buffer))))
+  (should (equal result (list info-xref-bad info-xref-good info-xref-unavail)))
+  ;; If there was an error, we can leave this around.
+  (kill-buffer info-xref-output-buffer))
+
+(ert-deftest info-xref-test-node-crossref ()
+  "Test parsing of @xref{node,crossref,,manual} with Texinfo 4/5."
+  (info-xref-test-internal "
+*Note crossref: (manual-foo)node.  Texinfo 4/5 format with crossref.
+" '(0 0 1)))
+
+(ert-deftest info-xref-test-node-4 ()
+  "Test parsing of @xref{node,,,manual} with Texinfo 4."
+  (info-xref-test-internal "
+*Note node: (manual-foo)node.  Texinfo 4 format with no crossref.
+" '(0 0 1)))
+
+(ert-deftest info-xref-test-node-5 ()
+  "Test parsing of @xref{node,,,manual} with Texinfo 5."
+  (info-xref-test-internal "
+*Note (manual-foo)node::.  Texinfo 5 format with no crossref.
+" '(0 0 1)))
+
+;; TODO Easier to have static data files in the repo?
+(defun info-xref-test-write-file (file body)
+  "Write BODY to texi FILE."
+  (with-temp-buffer
+    (insert "\
+\input texinfo
+@setfilename "
+            (format "%s.info\n" (file-name-sans-extension file))
+            "\
+@settitle test
+
+@ifnottex
+@node Top
+@top test
+@end ifnottex
+
+@menu
+* Chapter One::
+@end menu
+
+@node Chapter One
+@chapter Chapter One
+
+text.
+
+"
+            body
+            "\
+@bye
+"
+            )
+    (write-region nil nil file nil 'silent))
+  (should (equal 0 (call-process "makeinfo" file))))
+
+(ert-deftest info-xref-test-makeinfo ()
+  "Test that info-xref can parse basic makeinfo output."
+  :expected-result (if (executable-find "makeinfo") :passed :failed)
+  (should (executable-find "makeinfo"))
+  (let ((tempfile (make-temp-file "info-xref-test" nil ".texi"))
+        (tempfile2 (make-temp-file "info-xref-test2" nil ".texi"))
+        (errflag t))
+    (unwind-protect
+        (progn
+          ;; tempfile contains xrefs to various things, including tempfile2.
+          (info-xref-test-write-file
+           tempfile
+           (concat "\
+@xref{nodename,,,missing,Missing Manual}.
+
+@xref{nodename,crossref,title,missing,Missing Manual}.
+
+@xref{Chapter One}.
+
+@xref{Chapter One,Something}.
+
+"
+                   (format "@xref{Chapter One,,,%s,Present Manual}.\n"
+                           (file-name-sans-extension (file-name-nondirectory
+                                                      tempfile2)))))
+          ;; Something for tempfile to xref to.
+          (info-xref-test-write-file tempfile2 "")
+          (require 'info)
+          (save-window-excursion
+            (let ((Info-directory-list
+                   (list
+                    (or (file-name-directory tempfile) ".")))
+                  Info-additional-directory-list)
+              (info-xref-check (format "%s.info" (file-name-sans-extension
+                                                  tempfile))))
+            (should (equal (list info-xref-bad info-xref-good
+                                 info-xref-unavail)
+                           '(0 1 2)))
+            (setq errflag nil)
+            ;; If there was an error, we can leave this around.
+            (kill-buffer info-xref-output-buffer)))
+      ;; Useful diagnostic in case of problems.
+      (if errflag
+          (with-temp-buffer
+            (call-process "makeinfo" nil t nil "--version")
+            (message "%s" (buffer-string))))
+      (mapc 'delete-file (list tempfile tempfile2
+                               (format "%s.info" (file-name-sans-extension
+                                                  tempfile))
+                               (format "%s.info" (file-name-sans-extension
+                                                  tempfile2)))))))
+
+;;; info-xref.el ends here
diff --git a/test/automated/occur-tests.el b/test/automated/occur-tests.el
index 7cc4df6bffa..306803b7567 100644
--- a/test/automated/occur-tests.el
+++ b/test/automated/occur-tests.el
@@ -35,7 +35,7 @@ xd
 xex
 fx
 " "\
-5 matches for \"x\" in buffer:  *test-occur*
+6 matches in 5 lines for \"x\" in buffer:  *test-occur*
       1:xa
       3:cx
       4:xd
@@ -335,12 +335,18 @@ Each element has the format:
       (and (buffer-name temp-buffer)
            (kill-buffer temp-buffer)))))
 
-(ert-deftest occur-tests ()
-  "Test the functionality of `occur'.
-The test data is in the `occur-tests' constant."
-  (let ((occur-hook nil))
-    (dolist (test occur-tests)
-      (should (occur-test-case test)))))
+(defun occur-test-create (n)
+  "Create a test for element N of the `occur-tests' constant."
+  (let ((testname (intern (format "occur-test-%.2d" n)))
+        (testdoc (format "Test element %d of `occur-tests'." n)))
+    (eval
+     `(ert-deftest ,testname ()
+        ,testdoc
+        (let (occur-hook)
+          (should (occur-test-case (nth ,n occur-tests))))))))
+
+(dotimes (i (length occur-tests))
+  (occur-test-create i))
 
 (provide 'occur-tests)
 
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
new file mode 100755
index 00000000000..706ba953d98
--- /dev/null
+++ b/test/automated/package-test.el
@@ -0,0 +1,398 @@
+;;; package-test.el --- Tests for the Emacs package system
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Daniel Hackney <dan@haxney.org>
+;; Version: 1.0
+
+;; 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:
+
+;; You may want to run this from a separate Emacs instance from your
+;; main one, because a bug in the code below could mess with your
+;; installed packages.
+
+;; Run this in a clean Emacs session using:
+;;
+;;     $ emacs -Q --batch -L . -l package-test.el -l ert -f ert-run-tests-batch-and-exit
+
+;;; Code:
+
+(require 'package)
+(require 'ert)
+(require 'cl-lib)
+
+(defvar package-test-user-dir nil
+  "Directory to use for installing packages during testing.")
+
+(defvar package-test-file-dir (file-name-directory (or load-file-name
+                                                       buffer-file-name))
+  "Directory of the actual \"package-test.el\" file.")
+
+(defvar simple-single-desc
+  (package-desc-create :name 'simple-single
+                       :version '(1 3)
+                       :summary "A single-file package with no dependencies"
+                       :kind 'single)
+  "Expected `package-desc' parsed from simple-single-1.3.el.")
+
+(defvar simple-single-desc-1-4
+  (package-desc-create :name 'simple-single
+                       :version '(1 4)
+                       :summary "A single-file package with no dependencies"
+                       :kind 'single)
+  "Expected `package-desc' parsed from simple-single-1.4.el.")
+
+(defvar simple-depend-desc
+  (package-desc-create :name 'simple-depend
+                       :version '(1 0)
+                       :summary "A single-file package with a dependency."
+                       :kind 'single
+                       :reqs '((simple-single (1 3))))
+  "Expected `package-desc' parsed from simple-depend-1.0.el.")
+
+(defvar multi-file-desc
+  (package-desc-create :name 'multi-file
+                       :version '(0 2 3)
+                       :summary "Example of a multi-file tar package"
+                       :kind 'tar)
+  "Expected `package-desc' from \"multi-file-0.2.3.tar\".")
+
+(defvar new-pkg-desc
+  (package-desc-create :name 'new-pkg
+                       :version '(1 0)
+                       :kind 'single)
+  "Expected `package-desc' parsed from new-pkg-1.0.el.")
+
+(defvar package-test-data-dir (expand-file-name "data/package" package-test-file-dir)
+  "Base directory of package test files.")
+
+(defvar package-test-fake-contents-file
+  (expand-file-name "archive-contents" package-test-data-dir)
+  "Path to a static copy of \"archive-contents\".")
+
+(defvar package-test-built-file-suffixes '(".tar" "/dir" "/*.info")
+  "Remove these files when cleaning up a built package.")
+
+(cl-defmacro with-package-test ((&optional &key file
+                                           basedir
+                                           install
+                                           update-news
+                                           upload-base)
+                                &rest body)
+  "Set up temporary locations and variables for testing."
+  (declare (indent 1))
+  `(let* ((package-test-user-dir (make-temp-file "pkg-test-user-dir-" t))
+          (package-user-dir package-test-user-dir)
+          (package-archives `(("gnu" . ,package-test-data-dir)))
+          (old-yes-no-defn (symbol-function 'yes-or-no-p))
+          (old-pwd default-directory)
+          package--initialized
+          package-alist
+          ,@(if update-news
+                '(package-update-news-on-upload t)
+              (list (cl-gensym)))
+          ,@(if upload-base
+                '((package-test-archive-upload-base (make-temp-file "pkg-archive-base-" t))
+                  (package-archive-upload-base package-test-archive-upload-base))
+              (list (cl-gensym)))) ;; Dummy value so `let' doesn't try to bind `nil'
+     (unwind-protect
+         (progn
+           ,(if basedir `(cd ,basedir))
+           (setf (symbol-function 'yes-or-no-p) #'(lambda (&rest r) t))
+           (unless (file-directory-p package-user-dir)
+             (mkdir package-user-dir))
+           ,@(when install
+               `((package-initialize)
+                 (package-refresh-contents)
+                 (mapc 'package-install ,install)))
+           (with-temp-buffer
+             ,(if file
+                  `(insert-file-contents ,file))
+             ,@body))
+
+       (when (file-directory-p package-test-user-dir)
+         (delete-directory package-test-user-dir t))
+
+       (when (and (boundp 'package-test-archive-upload-base)
+                  (file-directory-p package-test-archive-upload-base))
+         (delete-directory package-test-archive-upload-base t))
+       (setf (symbol-function 'yes-or-no-p) old-yes-no-defn)
+       (cd old-pwd))))
+
+(defmacro with-fake-help-buffer (&rest body)
+  "Execute BODY in a temp buffer which is treated as the \"*Help*\" buffer."
+  `(with-temp-buffer
+    (help-mode)
+    ;; Trick `help-buffer' into using the temp buffer.
+    (let ((help-xref-following t))
+      ,@body)))
+
+(defun package-test-install-texinfo (file)
+  "Install from texinfo FILE.
+
+FILE should be a .texinfo file relative to the current
+`default-directory'"
+  (require 'info)
+  (let* ((full-file (expand-file-name file))
+         (info-file (replace-regexp-in-string "\\.texi\\'" ".info" full-file))
+         (old-info-defn (symbol-function 'Info-revert-find-node)))
+    (require 'info)
+    (setf (symbol-function 'Info-revert-find-node) #'ignore)
+    (with-current-buffer (find-file-literally full-file)
+      (unwind-protect
+          (progn
+            (require 'makeinfo)
+            (makeinfo-buffer)
+            ;; Give `makeinfo-buffer' a chance to finish
+            (while compilation-in-progress
+              (sit-for 0.1))
+            (call-process "ginstall-info" nil nil nil
+                          (format "--info-dir=%s" default-directory)
+                          (format "%s" info-file)))
+        (kill-buffer)
+        (setf (symbol-function 'Info-revert-find-node) old-info-defn)))))
+
+(defun package-test-strip-version (dir)
+  (replace-regexp-in-string "-pkg\\.el\\'" "" (package--description-file dir)))
+
+(defun package-test-suffix-matches (base suffix-list)
+  "Return file names matching BASE concatenated with each item in SUFFIX-LIST"
+  (cl-mapcan
+   '(lambda (item) (file-expand-wildcards (concat base item)))
+   suffix-list))
+
+(defun package-test-cleanup-built-files (dir)
+  "Remove files which were the result of creating a tar archive.
+
+DIR is the base name of the package directory, without the trailing slash"
+  (let* ((pkg-dirname (file-name-nondirectory dir)))
+    (dolist (file (package-test-suffix-matches dir package-test-built-file-suffixes))
+      (delete-file file))))
+
+(defun package-test-search-tar-file (filename)
+  "Search the current buffer's `tar-parse-info' variable for FILENAME.
+
+Must called from within a `tar-mode' buffer."
+  (cl-dolist (header tar-parse-info)
+    (let ((tar-name (tar-header-name header)))
+      (when (string= tar-name filename)
+        (cl-return t)))))
+
+(defun package-test-desc-version-string (desc)
+  "Return the package version as a string."
+  (package-version-join (package-desc-version desc)))
+
+(ert-deftest package-test-desc-from-buffer ()
+  "Parse an elisp buffer to get a `package-desc' object."
+  (with-package-test (:basedir "data/package" :file "simple-single-1.3.el")
+    (should (equal (package-buffer-info) simple-single-desc)))
+  (with-package-test (:basedir "data/package" :file "simple-depend-1.0.el")
+    (should (equal (package-buffer-info) simple-depend-desc)))
+  (with-package-test (:basedir "data/package"
+                               :file "multi-file-0.2.3.tar")
+    (tar-mode)
+    (should (equal (package-tar-file-info) multi-file-desc))))
+
+(ert-deftest package-test-install-single ()
+  "Install a single file without using an archive."
+  (with-package-test (:basedir "data/package" :file "simple-single-1.3.el")
+    (should (package-install-from-buffer))
+    (package-initialize)
+    (should (package-installed-p 'simple-single))
+    (let* ((simple-pkg-dir (file-name-as-directory
+                            (expand-file-name
+                             "simple-single-1.3"
+                             package-test-user-dir)))
+           (autoloads-file (expand-file-name "simple-single-autoloads.el"
+                                             simple-pkg-dir)))
+      (should (file-directory-p simple-pkg-dir))
+      (with-temp-buffer
+        (insert-file-contents (expand-file-name "simple-single-pkg.el"
+                                                simple-pkg-dir))
+        (should (string= (buffer-string)
+                         (concat "(define-package \"simple-single\" \"1.3\" "
+                                 "\"A single-file package "
+                                 "with no dependencies\" 'nil)\n"))))
+      (should (file-exists-p autoloads-file))
+      (should-not (get-file-buffer autoloads-file)))))
+
+(ert-deftest package-test-install-dependency ()
+  "Install a package which includes a dependency."
+  (with-package-test ()
+    (package-initialize)
+    (package-refresh-contents)
+    (package-install 'simple-depend)
+    (should (package-installed-p 'simple-single))
+    (should (package-installed-p 'simple-depend))))
+
+(ert-deftest package-test-refresh-contents ()
+  "Parse an \"archive-contents\" file."
+  (with-package-test ()
+    (package-initialize)
+    (package-refresh-contents)
+    (should (eq 3 (length package-archive-contents)))))
+
+(ert-deftest package-test-install-single-from-archive ()
+  "Install a single package from a package archive."
+  (with-package-test ()
+    (package-initialize)
+    (package-refresh-contents)
+    (package-install 'simple-single)))
+
+(ert-deftest package-test-install-multifile ()
+  "Check properties of the installed multi-file package."
+  (with-package-test (:basedir "data/package" :install '(multi-file))
+    (let ((autoload-file
+           (expand-file-name "multi-file-autoloads.el"
+                             (expand-file-name
+                              "multi-file-0.2.3"
+                              package-test-user-dir)))
+          (installed-files '("dir" "multi-file.info" "multi-file-sub.elc"
+                             "multi-file-autoloads.el" "multi-file.elc"))
+          (autoload-forms '("^(defvar multi-file-custom-var"
+                            "^(custom-autoload 'multi-file-custom-var"
+                            "^(autoload 'multi-file-mode"))
+          (pkg-dir (file-name-as-directory
+                    (expand-file-name
+                     "multi-file-0.2.3"
+                     package-test-user-dir))))
+      (package-refresh-contents)
+      (should (package-installed-p 'multi-file))
+      (with-temp-buffer
+        (insert-file-contents-literally autoload-file)
+        (dolist (fn installed-files)
+          (should (file-exists-p (expand-file-name fn pkg-dir))))
+        (dolist (re autoload-forms)
+          (goto-char (point-min))
+          (should (re-search-forward re nil t)))))))
+
+(ert-deftest package-test-update-listing ()
+  "Ensure installed package status is updated."
+  (with-package-test ()
+    (let ((buf (package-list-packages)))
+      (search-forward-regexp "^ +simple-single")
+      (package-menu-mark-install)
+      (package-menu-execute)
+      (should (package-installed-p 'simple-single))
+      (switch-to-buffer "*Packages*")
+      (goto-char (point-min))
+      (should (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+installed" nil t))
+      (goto-char (point-min))
+      (should-not (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+\\(available\\|new\\)" nil t))
+      (kill-buffer buf))))
+
+(ert-deftest package-test-update-archives ()
+  "Test updating package archives."
+  (with-package-test ()
+    (let ((buf (package-list-packages)))
+      (package-menu-refresh)
+      (search-forward-regexp "^ +simple-single")
+      (package-menu-mark-install)
+      (package-menu-execute)
+      (should (package-installed-p 'simple-single))
+      (let ((package-test-data-dir
+             (expand-file-name "data/package/newer-versions" package-test-file-dir)))
+        (setq package-archives `(("gnu" . ,package-test-data-dir)))
+        (package-menu-refresh)
+
+        ;; New version should be available and old version should be installed
+        (goto-char (point-min))
+        (should (re-search-forward "^\\s-+simple-single\\s-+1.4\\s-+new" nil t))
+        (should (re-search-forward "^\\s-+simple-single\\s-+1.3\\s-+installed" nil t))
+
+        (goto-char (point-min))
+        (should (re-search-forward "^\\s-+new-pkg\\s-+1.0\\s-+\\(available\\|new\\)" nil t))
+
+        (package-menu-mark-upgrades)
+        (package-menu-execute)
+        (package-menu-refresh)
+        (should (package-installed-p 'simple-single '(1 4)))))))
+
+(ert-deftest package-test-describe-package ()
+  "Test displaying help for a package."
+
+  (require 'finder-inf)
+  ;; Built-in
+  (with-fake-help-buffer
+   (describe-package '5x5)
+   (goto-char (point-min))
+   (should (search-forward "5x5 is a built-in package." nil t))
+   (should (search-forward "Status: Built-in." nil t))
+   (should (search-forward "Summary: simple little puzzle game" nil t))
+   (should (search-forward "The aim of 5x5" nil t)))
+
+  ;; Installed
+  (with-package-test ()
+    (package-initialize)
+    (package-refresh-contents)
+    (package-install 'simple-single)
+    (with-fake-help-buffer
+     (describe-package 'simple-single)
+     (goto-char (point-min))
+     (should (search-forward "simple-single is an installed package." nil t))
+     (should (search-forward
+              (format "Status: Installed in `%s/'."
+                      (expand-file-name "simple-single-1.3" package-user-dir))
+              nil t))
+     (should (search-forward "Version: 1.3" nil t))
+     (should (search-forward "Summary: A single-file package with no dependencies"
+                             nil t))
+     ;; No description, though. Because at this point we don't know
+     ;; what archive the package originated from, and we don't have
+     ;; its readme file saved.
+     )))
+
+(ert-deftest package-test-describe-not-installed-package ()
+  "Test displaying of the readme for not-installed package."
+
+  (with-package-test ()
+    (package-initialize)
+    (package-refresh-contents)
+    (with-fake-help-buffer
+     (describe-package 'simple-single)
+     (goto-char (point-min))
+     (should (search-forward "This package provides a minor mode to frobnicate"
+                             nil t)))))
+
+(ert-deftest package-test-describe-non-installed-package ()
+  "Test displaying of the readme for non-installed package."
+
+  (with-package-test ()
+    (package-initialize)
+    (package-refresh-contents)
+    (with-fake-help-buffer
+     (describe-package 'simple-single)
+     (goto-char (point-min))
+     (should (search-forward "This package provides a minor mode to frobnicate"
+                             nil t)))))
+
+(ert-deftest package-test-describe-non-installed-multi-file-package ()
+  "Test displaying of the readme for non-installed multi-file package."
+
+  (with-package-test ()
+    (package-initialize)
+    (package-refresh-contents)
+    (with-fake-help-buffer
+     (describe-package 'multi-file)
+     (goto-char (point-min))
+     (should (search-forward "This is a bare-bones readme file for the multi-file"
+                             nil t)))))
+
+(provide 'package-test)
+
+;;; package-test.el ends here
diff --git a/test/automated/package-x-test.el b/test/automated/package-x-test.el
new file mode 100755
index 00000000000..b8f2a23f6d5
--- /dev/null
+++ b/test/automated/package-x-test.el
@@ -0,0 +1,107 @@
+;;; package-test.el --- Tests for the Emacs package system
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Daniel Hackney <dan@haxney.org>
+;; Version: 1.0
+
+;; 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:
+
+;; You may want to run this from a separate Emacs instance from your
+;; main one, because a bug in the code below could mess with your
+;; installed packages.
+
+;; Run this in a clean Emacs session using:
+;;
+;;     $ emacs -Q --batch -L . -l package-x-test.el -f ert-run-tests-batch-and-exit
+
+;;; Code:
+
+(require 'package-x)
+(require 'ert)
+(require 'cl-lib)
+
+;; package-test is not normally in `load-path', so temporarily set
+;; `load-path' to contain the current directory.
+(let ((load-path (append (list (file-name-directory (or load-file-name
+                                                        buffer-file-name)))
+                         load-path)))
+  (require 'package-test))
+
+(defvar package-x-test--single-archive-entry-1-3
+  (cons 'simple-single
+        (package-make-ac-desc '(1 3) nil
+                              "A single-file package with no dependencies"
+                              'single))
+  "Expected contents of the archive entry from the \"simple-single\" package.")
+
+(defvar package-x-test--single-archive-entry-1-4
+  (cons 'simple-single
+        (package-make-ac-desc '(1 4) nil
+                              "A single-file package with no dependencies"
+                              'single))
+  "Expected contents of the archive entry from the updated \"simple-single\" package.")
+
+(ert-deftest package-x-test-upload-buffer ()
+  "Test creating an \"archive-contents\" file"
+  (with-package-test (:basedir "data/package"
+                               :file "simple-single-1.3.el"
+                               :upload-base t)
+    (package-upload-buffer)
+    (should (file-exists-p (expand-file-name "archive-contents"
+                                             package-archive-upload-base)))
+    (should (file-exists-p (expand-file-name "simple-single-1.3.el"
+                                             package-archive-upload-base)))
+    (should (file-exists-p (expand-file-name "simple-single-readme.txt"
+                                             package-archive-upload-base)))
+
+    (let (archive-contents)
+      (with-temp-buffer
+        (insert-file-contents
+         (expand-file-name "archive-contents"
+                           package-archive-upload-base))
+        (setq archive-contents
+              (package-read-from-string
+               (buffer-substring (point-min) (point-max)))))
+      (should (equal archive-contents
+                     (list 1 package-x-test--single-archive-entry-1-3))))))
+
+(ert-deftest package-x-test-upload-new-version ()
+  "Test uploading a new version of a package"
+  (with-package-test (:basedir "data/package"
+                               :file "simple-single-1.3.el"
+                               :upload-base t)
+    (package-upload-buffer)
+    (with-temp-buffer
+      (insert-file-contents "newer-versions/simple-single-1.4.el")
+      (package-upload-buffer))
+
+    (let (archive-contents)
+      (with-temp-buffer
+        (insert-file-contents
+         (expand-file-name "archive-contents"
+                           package-archive-upload-base))
+        (setq archive-contents
+              (package-read-from-string
+               (buffer-substring (point-min) (point-max)))))
+      (should (equal archive-contents
+                     (list 1 package-x-test--single-archive-entry-1-4))))))
+
+(provide 'package-x-test)
+
+;;; package-x-test.el ends here
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index 8462a863b84..40505cc7953 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -39,7 +39,8 @@ always located at the beginning of buffer."
 BODY is code to be executed within the temp buffer.  Point is
 always located at the beginning of buffer."
   (declare (indent 1) (debug t))
-  `(let* ((temp-file (concat (make-temp-file "python-tests") ".py"))
+  ;; temp-file never actually used for anything?
+  `(let* ((temp-file (make-temp-file "python-tests" nil ".py"))
           (buffer (find-file-noselect temp-file)))
      (unwind-protect
          (with-current-buffer buffer
@@ -47,7 +48,8 @@ always located at the beginning of buffer."
            (insert ,contents)
            (goto-char (point-min))
            ,@body)
-       (and buffer (kill-buffer buffer)))))
+       (and buffer (kill-buffer buffer))
+       (delete-file temp-file))))
 
 (defun python-tests-look-at (string &optional num restore-point)
   "Move point at beginning of STRING in the current buffer.
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index 77dd62821f7..a18899df02f 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -87,6 +87,9 @@ VALUES-PLIST is a list with alternating index and value elements."
 (ert-deftest ruby-heredoc-highlights-interpolations ()
   (ruby-assert-face "s = <<EOS\n  #{foo}\nEOS" 15 font-lock-variable-name-face))
 
+(ert-deftest ruby-no-heredoc-inside-quotes ()
+  (ruby-assert-state "\"<<\", \"\",\nfoo" 3 nil))
+
 (ert-deftest ruby-deep-indent ()
   (let ((ruby-deep-arglist nil)
         (ruby-deep-indent-paren '(?\( ?\{ ?\[ ?\] t)))
@@ -124,6 +127,12 @@ VALUES-PLIST is a list with alternating index and value elements."
 (ert-deftest ruby-regexp-can-be-multiline ()
   (ruby-assert-state "/bars\ntees # toots \nfoos/" 3 nil))
 
+(ert-deftest ruby-slash-symbol-is-not-mistaken-for-regexp ()
+  (ruby-assert-state ":/" 3 nil))
+
+(ert-deftest ruby-slash-char-literal-is-not-mistaken-for-regexp ()
+  (ruby-assert-state "?/" 3 nil))
+
 (ert-deftest ruby-indent-simple ()
   (ruby-should-indent-buffer
    "if foo
diff --git a/test/automated/undo-tests.el b/test/automated/undo-tests.el
index 3037db03602..98b0c52728b 100644
--- a/test/automated/undo-tests.el
+++ b/test/automated/undo-tests.el
@@ -1,6 +1,6 @@
 ;;; undo-tests.el --- Tests of primitive-undo
 
-;; Copyright (C) 2012  Aaron S. Hawley
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com>
 
@@ -140,26 +140,6 @@
                      (undo)
                      (buffer-string))))))
 
-(ert-deftest undo-test3 ()
-  "Test modtime with \\[undo] command."
-  (let ((tmpfile (make-temp-file "undo-test3")))
-    (with-temp-file tmpfile
-      (let ((buffer-file-name tmpfile))
-        (buffer-enable-undo)
-        (set (make-local-variable 'make-backup-files) nil)
-        (undo-boundary)
-        (insert ?\s)
-        (undo-boundary)
-        (basic-save-buffer)
-        (insert ?\t)
-        (undo)
-        (should
-         (string-equal (buffer-string)
-                       (progn
-                         (undo)
-                         (buffer-string)))))
-      (delete-file tmpfile))))
-
 (ert-deftest undo-test4 ()
   "Test \\[undo] of \\[flush-lines]."
   (with-temp-buffer