emacs-diffs
[Top][All Lists]
Advanced

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

emacs-28 2d15db6: Fix a semantic test on some macOS machines


From: Stefan Kangas
Subject: emacs-28 2d15db6: Fix a semantic test on some macOS machines
Date: Sat, 16 Oct 2021 21:05:54 -0400 (EDT)

branch: emacs-28
commit 2d15db6e892456b0577990c8dac7f48d39a915cd
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Fix a semantic test on some macOS machines
    
    * test/lisp/cedet/semantic/bovine/gcc-tests.el
    (semantic-gcc-test-output-parser-this-machine): Fix test on some macOS
    machines where running "gcc" runs "llvm" instead.
---
 test/lisp/cedet/semantic/bovine/gcc-tests.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/lisp/cedet/semantic/bovine/gcc-tests.el 
b/test/lisp/cedet/semantic/bovine/gcc-tests.el
index 93677d6..d049f95 100644
--- a/test/lisp/cedet/semantic/bovine/gcc-tests.el
+++ b/test/lisp/cedet/semantic/bovine/gcc-tests.el
@@ -124,6 +124,11 @@ gcc version 2.95.2 19991024 (release)"
   "Test the output parser against the machine currently running Emacs."
   (skip-unless (executable-find "gcc"))
   (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v"))))
-    (semantic-gcc-test-output-parser)))
+    ;; 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))
+        (semantic-gcc-test-output-parser))))
 
 ;;; gcc-tests.el ends here



reply via email to

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