Merge from mainline.

5 files changed, 123 insertions, 38 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index bffe85e6a7a..f3d14786bd9 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,30 @@
+2013-08-04  Glenn Morris  <rgm@gnu.org>
+
+        * automated/icalendar-tests.el (icalendar-tests--test-export)
+        (icalendar-tests--test-import): Try more precise TZ specification.
+
+2013-08-03  Glenn Morris  <rgm@gnu.org>
+
+        * automated/core-elisp-tests.el (core-elisp-tests): Fix defcustom.
+
+        * automated/icalendar-tests.el (icalendar-tests--test-export)
+        (icalendar-tests--test-import):
+        Use getenv/setenv rather than set-time-zone-rule.  Add debug messages.
+        (icalendar-tests--test-import): Reset zone even if error occurred.
+
+2013-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/core-elisp-tests.el: New file.
+
+2013-08-01  Glenn Morris  <rgm@gnu.org>
+
+        * automated/file-notify-tests.el (file-notify--test-remote-enabled):
+        Try to check that the remote system has a notification program.
+
+2013-07-31  Glenn Morris  <rgm@gnu.org>
+
+        * automated/undo-tests.el (undo-test2, undo-test5): Be quieter.
+
 2013-07-24  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/file-notify-tests.el
diff --git a/test/automated/core-elisp-tests.el b/test/automated/core-elisp-tests.el
new file mode 100644
index 00000000000..40169b836d5
--- /dev/null
+++ b/test/automated/core-elisp-tests.el
@@ -0,0 +1,40 @@
+;;; core-elisp-tests.el --- Testing some core Elisp rules
+
+;; Copyright (C) 2013 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 ()
+  "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) c-e-x)
+                         c-e-x)
+                   '(1 2)))))
+
+(provide 'core-elisp-tests)
+;;; core-elisp-tests.el ends here
diff --git a/test/automated/file-notify-tests.el b/test/automated/file-notify-tests.el
index 8bd4f258b1c..9f552ee7ab1 100644
--- a/test/automated/file-notify-tests.el
+++ b/test/automated/file-notify-tests.el
@@ -43,6 +43,7 @@
 (defvar file-notify--test-event nil)
 
 (require 'tramp)
+(require 'tramp-sh)
 (setq tramp-verbose 0
       tramp-message-show-message nil)
 (when noninteractive (defalias 'tramp-read-passwd 'ignore))
@@ -57,7 +58,18 @@
   (ignore-errors
     (and (file-remote-p file-notify-test-remote-temporary-file-directory)
          (file-directory-p file-notify-test-remote-temporary-file-directory)
-         (file-writable-p file-notify-test-remote-temporary-file-directory))))
+         (file-writable-p file-notify-test-remote-temporary-file-directory)
+         ;; Extracted from tramp-sh-handle-file-notify-add-watch.
+         ;; Even though the "remote" system is just ssh@localhost,
+         ;; the PATH might not be the same as the "local" PATH.
+         ;; Eg this seems to be the case on hydra.nixos.org.
+         ;; Without this, tests fail with:
+         ;; "No file notification program found on /ssh:localhost:"
+         ;; Try to fix PATH instead?
+         (with-parsed-tramp-file-name
+             file-notify-test-remote-temporary-file-directory nil
+             (or (tramp-get-remote-gvfs-monitor-dir v)
+                 (tramp-get-remote-inotifywait v))))))
 
 (defmacro file-notify--deftest-remote (test docstring)
   "Define ert `TEST-remote' for remote files."
diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 28fa47630a8..227855681e8 100644
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -428,12 +428,14 @@ Argument EXPECTED-OUTPUT expected iCalendar result string.
 
 European style input data must use german month names.  American
 and ISO style input data must use english month names."
-  (let ((tz (cadr (current-time-zone)))
+  (let ((tz (getenv "TZ"))
         (calendar-date-style 'iso)
         (icalendar-recurring-start-year 2000))
     (unwind-protect
         (progn
-          (set-time-zone-rule "CET")
+          (message "Current time zone: %s" (current-time-zone))
+          (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
+          (message "Current time zone: %s" (current-time-zone))
           (when input-iso
             (let ((calendar-month-name-array
                    ["January" "February" "March" "April" "May" "June" "July" "August"
@@ -461,8 +463,8 @@ and ISO style input data must use english month names."
                     "Saturday"]))
               (setq calendar-date-style 'american)
               (icalendar-tests--do-test-export input-american expected-output))))
-      ;; restore time-zone if something went terribly wrong
-      (set-time-zone-rule tz))))
+      ;; restore time-zone even if something went terribly wrong
+      (setenv "TZ" tz))))
 
 (defun icalendar-tests--do-test-export (input expected-output)
   "Actually perform export test.
@@ -671,37 +673,41 @@ Argument INPUT icalendar event string.
 Argument EXPECTED-ISO expected iso style diary string.
 Argument EXPECTED-EUROPEAN expected european style diary string.
 Argument EXPECTED-AMERICAN expected american style diary string."
-  (let ((timezone (cadr (current-time-zone))))
-    (set-time-zone-rule "CET")
-    (with-temp-buffer
-      (if (string-match "^BEGIN:VCALENDAR" input)
-          (insert input)
-        (insert "BEGIN:VCALENDAR\nPRODID:-//Emacs//NONSGML icalendar.el//EN\n")
-        (insert "VERSION:2.0\nBEGIN:VEVENT\n")
-        (insert input)
-        (unless (eq (char-before) ?\n)
-          (insert "\n"))
-        (insert "END:VEVENT\nEND:VCALENDAR\n"))
-      (let ((icalendar-import-format "%s%d%l%o%t%u%c%U")
-            (icalendar-import-format-summary "%s")
-            (icalendar-import-format-location "\n Location: %s")
-            (icalendar-import-format-description "\n Desc: %s")
-            (icalendar-import-format-organizer "\n Organizer: %s")
-            (icalendar-import-format-status "\n Status: %s")
-            (icalendar-import-format-url "\n URL: %s")
-            (icalendar-import-format-class "\n Class: %s")
-            (icalendar-import-format-uid "\n UID: %s")
-            calendar-date-style)
-        (when expected-iso
-          (setq calendar-date-style 'iso)
-          (icalendar-tests--do-test-import input expected-iso))
-        (when expected-european
-          (setq calendar-date-style 'european)
-          (icalendar-tests--do-test-import input expected-european))
-        (when expected-american
-          (setq calendar-date-style 'american)
-          (icalendar-tests--do-test-import input expected-american))))
-    (set-time-zone-rule timezone)))
+  (let ((timezone (getenv "TZ")))
+    (unwind-protect
+        (progn
+          (message "Current time zone: %s" (current-time-zone))
+          (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
+          (message "Current time zone: %s" (current-time-zone))
+          (with-temp-buffer
+            (if (string-match "^BEGIN:VCALENDAR" input)
+                (insert input)
+              (insert "BEGIN:VCALENDAR\nPRODID:-//Emacs//NONSGML icalendar.el//EN\n")
+              (insert "VERSION:2.0\nBEGIN:VEVENT\n")
+              (insert input)
+              (unless (eq (char-before) ?\n)
+                (insert "\n"))
+              (insert "END:VEVENT\nEND:VCALENDAR\n"))
+            (let ((icalendar-import-format "%s%d%l%o%t%u%c%U")
+                  (icalendar-import-format-summary "%s")
+                  (icalendar-import-format-location "\n Location: %s")
+                  (icalendar-import-format-description "\n Desc: %s")
+                  (icalendar-import-format-organizer "\n Organizer: %s")
+                  (icalendar-import-format-status "\n Status: %s")
+                  (icalendar-import-format-url "\n URL: %s")
+                  (icalendar-import-format-class "\n Class: %s")
+                  (icalendar-import-format-uid "\n UID: %s")
+                  calendar-date-style)
+              (when expected-iso
+                (setq calendar-date-style 'iso)
+                (icalendar-tests--do-test-import input expected-iso))
+              (when expected-european
+                (setq calendar-date-style 'european)
+                (icalendar-tests--do-test-import input expected-european))
+              (when expected-american
+                (setq calendar-date-style 'american)
+                (icalendar-tests--do-test-import input expected-american)))))
+      (setenv "TZ" timezone))))
 
 (defun icalendar-tests--do-test-import (input expected-output)
   "Actually perform import test.
diff --git a/test/automated/undo-tests.el b/test/automated/undo-tests.el
index 87c55c5d374..7b6989a5ef0 100644
--- a/test/automated/undo-tests.el
+++ b/test/automated/undo-tests.el
@@ -124,7 +124,7 @@
     (undo-boundary)
     (insert " Zero")
     (undo-boundary)
-    (push-mark)
+    (push-mark nil t)
     (delete-region (save-excursion
                      (forward-word -1)
                      (point)) (point))
@@ -172,7 +172,7 @@
     (insert " BEE")
     (undo-boundary)
     (setq buffer-undo-list (cons '(0.0 bogus) buffer-undo-list))
-    (push-mark)
+    (push-mark nil t)
     (delete-region (save-excursion
                      (forward-word -1)
                      (point)) (point))