Merge from trunk.

[gnu-emacs] / test / automated / ert-tests.el

diff --git a/test/automated/ert-tests.el b/test/automated/ert-tests.el
index cea994f64b834a471bb2b5b8a21c8b87e512d24a..1778afea8029d4e8bf78fe5ef4646045b5d49fe9 100644 (file)
--- a/test/automated/ert-tests.el
+++ b/test/automated/ert-tests.el
@@ -1,6 +1,6 @@
 ;;; ert-tests.el --- ERT's self-tests
 
-;; Copyright (C) 2007-2008, 2010-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Christian Ohler <ohler@gnu.org>
 
@@ -228,7 +228,7 @@ failed or if there was a problem."
                   :form (error "Foo")
                   :condition (error "Foo")
                   :fail-reason
-                  "the error signalled did not have the expected type"))))))
+                  "the error signaled did not have the expected type"))))))
   ;; Error of the expected type.
   (let* ((error nil)
          (test (make-ert-test
@@ -258,7 +258,7 @@ failed or if there was a problem."
                   :form (signal arith-error nil)
                   :condition (arith-error)
                   :fail-reason
-                  "the error signalled did not have the expected type"))))))
+                  "the error signaled did not have the expected type"))))))
   (let ((test (make-ert-test
                :body (lambda ()
                        (should-error (signal 'arith-error nil)
@@ -275,7 +275,7 @@ failed or if there was a problem."
                   :form (signal arith-error nil)
                   :condition (arith-error)
                   :fail-reason
-                  "the error signalled did not have the expected type"))))))
+                  "the error signaled did not have the expected type"))))))
   (let ((test (make-ert-test
                :body (lambda ()
                        (should-error (signal 'singularity-error nil)
@@ -292,7 +292,7 @@ failed or if there was a problem."
                   :form (signal singularity-error nil)
                   :condition (singularity-error)
                   :fail-reason
-                  "the error signalled was a subtype of the expected type")))))
+                  "the error signaled was a subtype of the expected type")))))
     ))
 
 (defmacro ert--test-my-list (&rest args)