* lisp/emacs-lisp/package.el (package-unpack): Load before compiling

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

diff --git a/test/automated/bytecomp-tests.el b/test/automated/bytecomp-tests.el
index 2bdc3c5bf129fe6b4a639ab4170a8e4daa0eef3c..c65009cb1b090cb7981f2e0e05a9c2f7f63d4000 100644 (file)
--- a/test/automated/bytecomp-tests.el
+++ b/test/automated/bytecomp-tests.el
@@ -1,6 +1,6 @@
 ;;; bytecomp-testsuite.el
 
-;; Copyright (C) 2008-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
 
 ;; Author:         Shigeru Fukaya <shigeru.fukaya@gmail.com>
 ;; Created:        November 2008
@@ -376,8 +376,12 @@ Subtests signal errors if something goes wrong."
   (with-current-buffer (get-buffer-create "*Compile-Log*")
     (goto-char (point-min))
     ;; Should warn that mt--test1[12] are first used as functions.
-    (should (re-search-forward "my--test11:\n.*macro" nil t))
-    (should (re-search-forward "my--test12:\n.*macro" nil t))
+    ;; The second alternative is for when the file name is so long
+    ;; that pretty-printing starts the message on the next line.
+    (should (or (re-search-forward "my--test11:\n.*macro" nil t)
+                (re-search-forward "my--test11:\n.*:\n.*macro" nil t)))
+    (should (or (re-search-forward "my--test12:\n.*macro" nil t)
+                (re-search-forward "my--test12:\n.*:\n.*macro" nil t)))
     (goto-char (point-min))
     ;; Should not warn that mt--test2 is not known to be defined.
     (should-not (re-search-forward "my--test2" nil t))))