[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 ad82bbdf08 2/2: Fix test lisp/cedet/semantic/bovine/gcc-tests o
From: |
Robert Pluim |
Subject: |
emacs-28 ad82bbdf08 2/2: Fix test lisp/cedet/semantic/bovine/gcc-tests on macOS (Bug#52431) |
Date: |
Wed, 12 Jan 2022 03:25:55 -0500 (EST) |
branch: emacs-28
commit ad82bbdf08bb2d65c048299ce3740dd151ac733c
Author: Philipp Stephani <phst@google.com>
Commit: Robert Pluim <rpluim@gmail.com>
Fix test lisp/cedet/semantic/bovine/gcc-tests on macOS (Bug#52431)
* 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 @@ gcc version 2.95.2 19991024 (release)"
;; 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