Re: Emacs pretest 28.0.91 is out

[Robert Pluim <rpluim@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 738 bytes --]

>>>>> On Tue, 11 Jan 2022 19:06:44 +0200, Eli Zaretskii <eliz@gnu.org> said:

    >> From: Robert Pluim <rpluim@gmail.com>
    >> Date: Tue, 11 Jan 2022 15:14:33 +0100
    >> Cc: emacs-devel@gnu.org
    >> 
    >> I see the latter two are fixed on master already. I guess since this
    >> is macOS specific weʼre not going to backport those to emacs-28.

    Eli> If the fixes are simple enough, we could backport them  The test suite
    Eli> is not really critical for the success of a release, so we can install
    Eli> changes in it which we won't in the "main" code.

It would basically be the attached, although Iʼll note that the tests
theyʼre using to determine if gcc is clang are different.

Robert
-- 


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Don-t-fail-flymake-tests-if-gcc-actually-is-Clang.patch --]
[-- Type: text/x-diff, Size: 1995 bytes --]

From b4632b2afb0aff4d1b2d1c7fd40d7ee26b228eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= <mattiase@acm.org>
Date: Sun, 2 Jan 2022 13:00:13 +0100
Subject: [PATCH 1/2] Don't fail flymake-tests if `gcc` actually is Clang
To: emacs-devel@gnu.org

* test/lisp/progmodes/flymake-tests.el (flymake-tests--gcc-is-clang)
(different-diagnostic-types, included-c-header-files): Skip tests that
depend on the `gcc` command really being GCC and not Clang.

(cherry picked from commit b2167d98432a78442522b7564e22f47d75a98b6f)
---
 test/lisp/progmodes/flymake-tests.el | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 2eb4004f10..45cabf2efb 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -140,9 +140,15 @@ ruby-backend
             (should (eq 'flymake-error (face-at-point)))))
       (delete-directory tempdir t))))
 
+(defun flymake-tests--gcc-is-clang ()
+  "Whether the `gcc' command actually runs the Clang compiler."
+  (string-match "[Cc]lang version "
+                (shell-command-to-string "gcc --version")))
+
 (ert-deftest different-diagnostic-types ()
   "Test GCC warning via function predicate."
   (skip-unless (and (executable-find "gcc")
+                    (not (flymake-tests--gcc-is-clang))
                     (version<=
                      "5" (string-trim
                           (shell-command-to-string "gcc -dumpversion")))
@@ -166,7 +172,9 @@ different-diagnostic-types
 
 (ert-deftest included-c-header-files ()
   "Test inclusion of .h header files."
-  (skip-unless (and (executable-find "gcc") (executable-find "make")))
+  (skip-unless (and (executable-find "gcc")
+                    (not (flymake-tests--gcc-is-clang))
+                    (executable-find "make")))
   (let ((flymake-wrap-around nil))
     (flymake-tests--with-flymake
         ("some-problems.h")
-- 
2.34.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Fix-test-lisp-cedet-semantic-bovine-gcc-tests-on-mac.patch --]
[-- Type: text/x-diff, Size: 1452 bytes --]

From d6c33d55def9f1e3021a418e6e3f3cf4be44cc68 Mon Sep 17 00:00:00 2001
From: Philipp Stephani <phst@google.com>
Date: Tue, 28 Dec 2021 21:05:23 +0100
Subject: [PATCH 2/2] Fix test lisp/cedet/semantic/bovine/gcc-tests on macOS
 (Bug#52431)
To: emacs-devel@gnu.org

* test/lisp/cedet/semantic/bovine/gcc-tests.el
(semantic-gcc-test-output-parser-this-machine): Also detect Apple
clang on macOS Monterey.

(cherry picked from commit 6e52becfbe2a33c025b8c4838b3c8f06ba5a6fb8)
---
 test/lisp/cedet/semantic/bovine/gcc-tests.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/lisp/cedet/semantic/bovine/gcc-tests.el b/test/lisp/cedet/semantic/bovine/gcc-tests.el
index 2ebd991679..2e61f91e58 100644
--- a/test/lisp/cedet/semantic/bovine/gcc-tests.el
+++ b/test/lisp/cedet/semantic/bovine/gcc-tests.el
@@ -127,8 +127,9 @@ semantic-gcc-test-output-parser-this-machine
     ;; Some macOS machines run llvm when you type gcc.  (!)
     ;; We can't even check if it's a symlink; it's a binary placed in
     ;; "/usr/bin/gcc".  So check the output and just skip this test if
-    ;; it says "Apple LLVM".
-    (unless (string-match "Apple LLVM" (car semantic-gcc-test-strings))
+    ;; it looks like that's the case.
+    (unless (string-match "Apple \\(LLVM\\|clang\\)\\|Xcode\\.app"
+                          (car semantic-gcc-test-strings))
         (semantic-gcc-test-output-parser))))
 
 ;;; gcc-tests.el ends here
-- 
2.34.0