emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 3be98ca: Fix bytecomp-tests--warnings when $TMPDIR


From: Eli Zaretskii
Subject: [Emacs-diffs] master 3be98ca: Fix bytecomp-tests--warnings when $TMPDIR has a long name
Date: Sun, 21 Jun 2015 17:28:39 +0000

branch: master
commit 3be98ca53b5de3d6442c9318663a8f3cb4dbfed0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix bytecomp-tests--warnings when $TMPDIR has a long name
    
    * test/automated/bytecomp-tests.el (bytecomp-tests--warnings):
    Allow the warning to begin on the 3rd, not only 2nd line, which
    happens if temporary-file-directory has a very long name.
---
 test/automated/bytecomp-tests.el |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/automated/bytecomp-tests.el b/test/automated/bytecomp-tests.el
index f51710a..c65009c 100644
--- a/test/automated/bytecomp-tests.el
+++ b/test/automated/bytecomp-tests.el
@@ -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))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]