From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.devel Subject: Re: Emacs pretest 28.0.91 is out Date: Tue, 11 Jan 2022 18:45:09 +0100 Message-ID: <87tuea415m.fsf@gmail.com> References: <877db65wg4.fsf@gmail.com> <87y23m4awm.fsf@gmail.com> <83o84i6w2j.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24648"; mail-complaints-to="usenet@ciao.gmane.io" Cc: stefan@marxist.se, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Jan 11 18:48:03 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n7LFb-0006E4-AB for ged-emacs-devel@m.gmane-mx.org; Tue, 11 Jan 2022 18:48:03 +0100 Original-Received: from localhost ([::1]:50588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7LFY-0004fl-HK for ged-emacs-devel@m.gmane-mx.org; Tue, 11 Jan 2022 12:48:00 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:43558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7LCs-0001WS-5V for emacs-devel@gnu.org; Tue, 11 Jan 2022 12:45:14 -0500 Original-Received: from [2a00:1450:4864:20::429] (port=45703 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7LCq-0004MT-D4; Tue, 11 Jan 2022 12:45:13 -0500 Original-Received: by mail-wr1-x429.google.com with SMTP id q8so34316248wra.12; Tue, 11 Jan 2022 09:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:gmane-reply-to-list:date:in-reply-to :message-id:mime-version; bh=aKZuBJTWFh1hS6pbqnNUL+i7HTZlO4tVUz6bviA9VhA=; b=UEHcy8UFVqGtij/4TgB6STD4ckFzHB4hMW5E/wYe5AjBDkndYzlv5KdfYEOk9cmOP+ QXLc7F4I+epN6fyH6NEM4gPCsbcoqUt4PauK2kdcyFmXKN9Q57Y+rJlUxnxNZKnwIqoK m4YAN/P3chWv/qY/d90qBKIMS//DQqt64flAvhjX51vdl+39fYCeURoFDRoGDUd/WNCX bLaKFN4CjFNlJ82HvEZMdso9f8Ci67oA1qbiSVNgomoUtJdtdB7jBYUwJCy5vGQTVNRk l741dxDA/wwtHkB8k6OJWZl/0vJreVMT0bmHt6GJp1UX4mhXF6LnnXZu/PU/P80oHscz SWmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references :gmane-reply-to-list:date:in-reply-to:message-id:mime-version; bh=aKZuBJTWFh1hS6pbqnNUL+i7HTZlO4tVUz6bviA9VhA=; b=yCkQLbbTEXpN2p8PODyNyDC6tU9knB3Boroyl7xTgAY8iKXgmw95WjED/gdgqRAX6S YhCHh+DhkInxtsZGhjttUgMRlh9Sk45yIkbC6y0igj2NQouwSqiIa4JKouN1ffB0Gep0 PTeWc+SErbkZbo/jDn1WBETWI/J1iXF55vCvoLoL6xlsK3lvpF88+D5hFv5dd5hM/fFt codZzFj6VbO/9Q1G9E3Wtg0JwrI29O5dkXU20Jmwe9AypnhVSNp9R8asldFjsWNkJ4vP 6gcXionhvzaS4u5lXV588eIrjJxyOZgCrI6yl0DDRHDnUBMY3f0IhIY+xWjHhA3IGvAJ I/iA== X-Gm-Message-State: AOAM530yTTTI+mHlRuxpCP04tNryGtVR4n2izuqKQS+KCXKQe6S2MHEK Sw35MWd6PAhCwSh+M/HPwicp9Lwn+YE= X-Google-Smtp-Source: ABdhPJz5vqB4KMz2v2OBtaiTXar5dZLl0NQCNm+VK7fl5egvK2K1+o7CiW8Jd99fu3l79u3EBV8+VA== X-Received: by 2002:a5d:598c:: with SMTP id n12mr4860112wri.541.1641923110696; Tue, 11 Jan 2022 09:45:10 -0800 (PST) Original-Received: from rltb ([2a01:e0a:3f3:fb50:ddcd:23b:139e:fb73]) by smtp.gmail.com with ESMTPSA id k10sm10079240wrz.113.2022.01.11.09.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 09:45:10 -0800 (PST) Gmane-Reply-To-List: yes In-Reply-To: <83o84i6w2j.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 11 Jan 2022 19:06:44 +0200") X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=rpluim@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:284622 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable >>>>> On Tue, 11 Jan 2022 19:06:44 +0200, Eli Zaretskii said: >> From: Robert Pluim >> Date: Tue, 11 Jan 2022 15:14:33 +0100 >> Cc: emacs-devel@gnu.org >>=20 >> I see the latter two are fixed on master already. I guess since this >> is macOS specific we=CA=BCre not going to backport those to emacs-28. Eli> If the fixes are simple enough, we could backport them The test s= uite Eli> is not really critical for the success of a release, so we can ins= tall Eli> changes in it which we won't in the "main" code. It would basically be the attached, although I=CA=BCll note that the tests they=CA=BCre using to determine if gcc is clang are different. Robert --=20 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Don-t-fail-flymake-tests-if-gcc-actually-is-Clang.patch >From b4632b2afb0aff4d1b2d1c7fd40d7ee26b228eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= 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 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Fix-test-lisp-cedet-semantic-bovine-gcc-tests-on-mac.patch >From d6c33d55def9f1e3021a418e6e3f3cf4be44cc68 Mon Sep 17 00:00:00 2001 From: Philipp Stephani 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 --=-=-=--