From 3be98ca53b5de3d6442c9318663a8f3cb4dbfed0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 21 Jun 2015 20:27:48 +0300 Subject: [PATCH] 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 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/automated/bytecomp-tests.el b/test/automated/bytecomp-tests.el index f51710aa8c5..c65009cb1b0 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)))) -- 2.39.2