Received: (at 81480) by debbugs.gnu.org; 30 Jul 2026 11:27:15 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jul 30 07:27:14 2026 Received: from localhost ([127.0.0.1]:58539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1wpOuu-0000BJ-QN for submit <at> debbugs.gnu.org; Thu, 30 Jul 2026 07:27:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51090) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1wpOur-0000AF-Mk for 81480 <at> debbugs.gnu.org; Thu, 30 Jul 2026 07:27:10 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1wpOul-0008Kt-Iu; Thu, 30 Jul 2026 07:27:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=UQEcS6RaAy+NXcfNNVHqYkvt05kkGxS2wfWiHcpM0cs=; b=Wa7HQfsBGLOzY3F9pjeo cZR8s9B6pSQ6yB7Lei3himpY0e1+incKjpV8CWW5yKalesEGN7mO8XKlb6Ks/EjRxAvyBSWbH4+uU bBwstgpg3c7hMLJNCybd+56xBPSpIClVyTky1A2ztobv9HqUE4KJaPHgVM1gMYp6LjJ5nYSlXgD6I CTO7XPkUHcS0OGuIYpFFj8rSNqsaF5IvFSspP08rBke7W2CsRHkFAtlQvuJ/7TNhAwI+ItelFBHTw rw3vbumKTt2DXamjK/twkfHVIPaxJ5UXrC7nAljVtGNhUhxVuz88WAI1LWZCijV+5CdqCILN5+MoP Ud5PP8qRBRbhmQ==; Date: Thu, 30 Jul 2026 14:27:00 +0300 Message-Id: <8633x0yayj.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Sean Whitton <spwhitton@HIDDEN> In-Reply-To: <87a4r8bubb.fsf@HIDDEN> (message from Sean Whitton on Thu, 30 Jul 2026 12:17:28 +0100) Subject: Re: bug#81480: 31.0.91; diff-mode-test-* incorrectly assumes "diff -a" References: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN> <875x20u6dn.fsf@HIDDEN> <86mrvcpmb4.fsf@HIDDEN> <87a4r8bubb.fsf@HIDDEN> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 81480 Cc: 81480 <at> debbugs.gnu.org, eggert@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) > From: Sean Whitton <spwhitton@HIDDEN> > Cc: eggert@HIDDEN, 81480 <at> debbugs.gnu.org > Date: Thu, 30 Jul 2026 12:17:28 +0100 > > Eli Zaretskii [27/Jul 4:57pm +03] wrote: > >> From: Sean Whitton <spwhitton@HIDDEN> > >> Date: Mon, 27 Jul 2026 10:30:28 +0100 > >> > >> Paul Eggert [24/Jul 1:55pm -07] wrote: > >> > This follows up on bug#81465 "31.0.91; ‘make check’ failures on Solaris > >> > 10 sparc 32-bit" and I am splitting this issue off into a separate bug > >> > report. > >> > > >> > Some diff-mode-test-* patches fail because they use ‘diff -a’. The -a > >> > option is a GNU extension to POSIX and is not supported by Solaris 10 diff. > >> > >> I don't understand what you mean by saying that they *use* 'diff -a' -- > >> if it's -a that turns on the "No newline at end of file" output, then > >> the problem has to be that -a is the implicit default behaviour for GNU > >> diff? > > > > No, AFAICT, the "No newline at end of file" is a separate problem. > > > >> AFAICT we don't explicitly pass -a anywhere. > > > > We do, in smerge-refine-regions (which these tests invoke indirectly, > > see the backtraces from the failing tests). > > Thanks, I got confused somehow there. Let's fix this along the lines > of your patch. I will, assuming Paul confirms that they fix the problem.
bug-gnu-emacs@HIDDEN:bug#81480; Package emacs.
Full text available.Received: (at 81480) by debbugs.gnu.org; 30 Jul 2026 11:17:38 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jul 30 07:17:38 2026 Received: from localhost ([127.0.0.1]:58511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1wpOld-00076X-He for submit <at> debbugs.gnu.org; Thu, 30 Jul 2026 07:17:37 -0400 Received: from fhigh-b5-smtp.messagingengine.com ([202.12.124.156]:46451) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <spwhitton@HIDDEN>) id 1wpOlb-00075V-Ke for 81480 <at> debbugs.gnu.org; Thu, 30 Jul 2026 07:17:36 -0400 Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfhigh.stl.internal (Postfix) with ESMTP id 36E7F7A00AD; Thu, 30 Jul 2026 07:17:30 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Thu, 30 Jul 2026 07:17:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:cc:content-transfer-encoding:content-type:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:subject:subject:to:to; s=fm1; t=1785410250; x=1785496650; bh=B3nU/AwYL90y6PNgMvuYY3mVXOut3u3W 0/9cn4KHgrc=; b=jYVG5nOPckq1I7oUqnlup2q1hvywGvp43RMsHEPqrda4S0tA VCXNwGtW5BhznWLBHZIEoDEepiBFhFc72k5d4TYRGYLmVUxhugoZ8r8ctXHsvE/e wErXiBiZirgcyT4yBJk2uIaB7rvgPJ84n7SghIGSLbHLu3Qt1OS8ePDLEyMGoKuk i9sop9lmfNbfG6vVKE5FPe6GL1LZfFSnXtbq3XeKCXl9RF3OBiNODSYOlqEYNqZd Y19RICG88lMHLIT9EP1ED7gAPuHp1MoK6npaqkyv3w1s4zzV/VzFOstxyI314JyE RWKgEiWam1fkVuMcAP/D2jOFm/agBiXBtw/2Pw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1785410250; x= 1785496650; bh=B3nU/AwYL90y6PNgMvuYY3mVXOut3u3W0/9cn4KHgrc=; b=D 7LJggXy7J6x0Cfbdutx+cqg/lzHI9XwR54mzcI4qnmRnp/C+Nj1B9mj7JZ6Cbs6s ph7TQjYHe9OtILGbT+TaDFxqgd2dIuU9KQq3VfOdaRs9YjiV0Ok26HlJF6RPI2bq OOH7KU3I+INQcEeEaFrUdezJjF5uKaGE72G7K5Z324B0OkRIynWajBDlPz3ddBwJ ghUsypH4EE3HmOKwvxgBRKufNJTE97dET5f1WHGFQ6Y0/fXMJn1ZJyXtPHyYLOG4 8xGnzPLLdRvfXhP7Zo8acwT5ErXjwXG2hqheg10xYXDOQP7fncQdED9u0mYN872p diOPodIMbpg3teh2zSrug== X-ME-Sender: <xms:yTJralxgd0AYgBi1bxIUFpDJFHNK_a7nppwO-OJrWc0Lmsa2IuDphg> <xme:yTJratAyATkT8QxxsDR_gzZHVMmX55eBzEBs8Zn7ATwKJ9uK312B8xnyhW-NTLx18 dh-pIeUfJHRvLxJ4THS_i4bYkbHDilIbAIAlIAmqVJgvWCcKG9HcsNh> X-ME-Received: <xmr:yTJraib-SvsMkRnjOl1MUxzhBu7p9Pw5VNZBDgjt-KASw85a-e0JU-asKcYh9Sy4B1WGB7KnCbVU> X-ME-Proxy-Cause: dmFkZTF0I33CDw4Hsl15CIwz/TcBchi6e1oslt15bfmGN6UhAFluqbzT1RljobeqUNwM99 +ztSdeT6AaNwMC4yqroVhiMSd/FBklrcxJRbeUyj5X1o94qdBiHf0beiawqmAQeXn2hOq5 pO2DLP+JdtVdgUHSwVdum19Gq7Xrp+5qWA0G8r0Y4Si7IYtH/p46PU/CshJIT9HISYa9y8 7F+WnNy3XWDk/U/ObH32U7WkpC1V8ZTqrjMmHb3GdMX9kmjErL6A+MUJXxyihg4jDBUxY/ Gs5u/+r7/cirj4kkuNhJHkDkUo9PFcybGda5VLH2GLUsQsseK/4Jt87hqPNwPjkbcP4uMN zZqMg/iay8T9lMQvus1vsINRKUMRthFtPb3PXM8C2QT08TXGmrW7GwPeJyEV4teUp7MgNv kUn4OQLy0NOszHDgEZyZYFMzjBokWUBEUiDLx0Ow7/U4IRJQL+F0C3Ea9BVOaYatBOyH62 N73fY6tw2ITVtHqUTzGDWOGaLgSwEfP1pk9eCzo0Gv2nwLu0gJOLYmxHXOoLfQgdUTLvKT OHnpPAs5pF1q4Fhou00Tla+DCX709kTRrSyDmvgRGn3X6U9mAle3r40ENnyC3ONtMKv37s aLNIK9AqswmpzJT5zu7tpRZGS58wdL63gqe2poX41fjidEXBElhDl5q1glIQ X-ME-Proxy: <xmx:yTJraljb3ah2iCb-VmAPBXN392vdANK8H4QQ8T5g6TZSaalBLbBsrw> <xmx:yTJrak5-eix92WuoFccl8dXGzLqhgggfuHXq0oQbSNUOcF07qNxqtQ> <xmx:yTJras6buHR99pJrPybVyypYFxwq2i66f75fB4CcpNVqucHKYQbnhA> <xmx:yTJraod4Z0K5tScNx2CPeMsBYM2qynq45KgrSLrgegug5MbJSrnDuA> <xmx:yjJrasoDufg1MEbDCQbaW6S5pDY3OCFBbHXtb79xq9TCzc_82g5CzXhQ> Feedback-ID: i62564b17:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 Jul 2026 07:17:29 -0400 (EDT) Received: by melete.silentflame.com (Postfix, from userid 1000) id ED4477E7B9A; Thu, 30 Jul 2026 12:17:28 +0100 (BST) From: Sean Whitton <spwhitton@HIDDEN> To: Eli Zaretskii <eliz@HIDDEN> Subject: Re: bug#81480: 31.0.91; diff-mode-test-* incorrectly assumes "diff -a" In-Reply-To: <86mrvcpmb4.fsf@HIDDEN> References: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN> <875x20u6dn.fsf@HIDDEN> <86mrvcpmb4.fsf@HIDDEN> Date: Thu, 30 Jul 2026 12:17:28 +0100 Message-ID: <87a4r8bubb.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 81480 Cc: 81480 <at> debbugs.gnu.org, eggert@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Eli Zaretskii [27/Jul 4:57pm +03] wrote: >> From: Sean Whitton <spwhitton@HIDDEN> >> Date: Mon, 27 Jul 2026 10:30:28 +0100 >> >> Paul Eggert [24/Jul 1:55pm -07] wrote: >> > This follows up on bug#81465 "31.0.91; =E2=80=98make check=E2=80=99 fa= ilures on Solaris >> > 10 sparc 32-bit" and I am splitting this issue off into a separate bug >> > report. >> > >> > Some diff-mode-test-* patches fail because they use =E2=80=98diff -a= =E2=80=99. The -a >> > option is a GNU extension to POSIX and is not supported by Solaris 10 = diff. >> >> I don't understand what you mean by saying that they *use* 'diff -a' -- >> if it's -a that turns on the "No newline at end of file" output, then >> the problem has to be that -a is the implicit default behaviour for GNU >> diff? > > No, AFAICT, the "No newline at end of file" is a separate problem. > >> AFAICT we don't explicitly pass -a anywhere. > > We do, in smerge-refine-regions (which these tests invoke indirectly, > see the backtraces from the failing tests). Thanks, I got confused somehow there. Let's fix this along the lines of your patch. --=20 Sean Whitton
bug-gnu-emacs@HIDDEN:bug#81480; Package emacs.
Full text available.Received: (at 81480) by debbugs.gnu.org; 27 Jul 2026 13:57:53 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 27 09:57:52 2026 Received: from localhost ([127.0.0.1]:37904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1woLq1-0000IL-I1 for submit <at> debbugs.gnu.org; Mon, 27 Jul 2026 09:57:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40816) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1woLpw-0000FD-NB for 81480 <at> debbugs.gnu.org; Mon, 27 Jul 2026 09:57:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <eliz@HIDDEN>) id 1woLpq-0006VW-W5; Mon, 27 Jul 2026 09:57:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=BxO/DXXA4NLlS9NIXy1+4SEIoYHdwjlm+D/DE4+4BSc=; b=h2csLmUCuV4PdraHtPeQ 7VqOWzMXlVM50I17frlA+RfaP+nBQfcJkF+/sm07Ub3WMeQUyIBju/Qhajl4E3o64Nofq/GQlQJOc P/+WVi88UXmYexpJqj2yeGj8D+ORLJOBP3UfeuLtXA12UAQIh2V7h1SYL15yDKzSHXsziUFcIJKqL AD5qK5G794eZcN1pJ0b0zTwkMEeTS4JvWiV5EwJ9VhjMU+vQF5GnKXurgJap0LZdemFwXbLW2kAxl v2ysyrn9ZYuonXPAS8ET0fQYiOQ/GtLENsmy/bYmlx1kYcB9bTh724ao7voFX2A8DMHac0N4E4USN orMBEPa/Sgn/7A==; Date: Mon, 27 Jul 2026 16:57:35 +0300 Message-Id: <86mrvcpmb4.fsf@HIDDEN> From: Eli Zaretskii <eliz@HIDDEN> To: Sean Whitton <spwhitton@HIDDEN> In-Reply-To: <875x20u6dn.fsf@HIDDEN> (message from Sean Whitton on Mon, 27 Jul 2026 10:30:28 +0100) Subject: Re: bug#81480: 31.0.91; diff-mode-test-* incorrectly assumes "diff -a" References: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN> <875x20u6dn.fsf@HIDDEN> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 81480 Cc: 81480 <at> debbugs.gnu.org, eggert@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) > From: Sean Whitton <spwhitton@HIDDEN> > Date: Mon, 27 Jul 2026 10:30:28 +0100 > > Paul Eggert [24/Jul 1:55pm -07] wrote: > > This follows up on bug#81465 "31.0.91; ‘make check’ failures on Solaris > > 10 sparc 32-bit" and I am splitting this issue off into a separate bug > > report. > > > > Some diff-mode-test-* patches fail because they use ‘diff -a’. The -a > > option is a GNU extension to POSIX and is not supported by Solaris 10 diff. > > I don't understand what you mean by saying that they *use* 'diff -a' -- > if it's -a that turns on the "No newline at end of file" output, then > the problem has to be that -a is the implicit default behaviour for GNU > diff? No, AFAICT, the "No newline at end of file" is a separate problem. > AFAICT we don't explicitly pass -a anywhere. We do, in smerge-refine-regions (which these tests invoke indirectly, see the backtraces from the failing tests).
bug-gnu-emacs@HIDDEN:bug#81480; Package emacs.
Full text available.Received: (at 81480) by debbugs.gnu.org; 27 Jul 2026 09:30:39 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 27 05:30:39 2026 Received: from localhost ([127.0.0.1]:36525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1woHfS-0004ac-GA for submit <at> debbugs.gnu.org; Mon, 27 Jul 2026 05:30:38 -0400 Received: from fhigh-a5-smtp.messagingengine.com ([103.168.172.156]:48639) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <spwhitton@HIDDEN>) id 1woHfP-0004ZS-R2 for 81480 <at> debbugs.gnu.org; Mon, 27 Jul 2026 05:30:36 -0400 Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id 2FA581400156; Mon, 27 Jul 2026 05:30:30 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Mon, 27 Jul 2026 05:30:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1785144630; x=1785231030; bh=gtoluNgdtbYp1kFQIadhN0lMmiRZJ1O/OEDzlOp1bDU=; b= FOiDK6k1g7mtw1J3jyMl8X5lriT2Oh3PnBAArR8fAjpCvA2us7sSUVDTBupOCcaJ 5o6LXpCIzjNpY8GkGwVjgWSnOFB45RuyF1Jn6OzgJ9ubiqb4NiJbPX5ZM/Q8meYL s2b9z6Q1Cw+oS7JOTZHPUml2q62sPdAp9ilIcpXAA9jfilL8LVdkQICI5Si/GtWX tMc7uqYnSlMx3Uo+WYekHhNVl/EawqzbzVJoMzE/Ov2D3KEVXNEBpj22RNyy7Gtf rmpOOtldURbaNr9nMM4vQwNUm3iPNq3JMOb0q8pjoW3sjaDrSRs0vriXd/xcUWkb xwpeJMGziKEFLEZauZ1UnA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1785144630; x=1785231030; bh=g toluNgdtbYp1kFQIadhN0lMmiRZJ1O/OEDzlOp1bDU=; b=dG57exn7PeGgx278t O/GR5L+dIuPnrJ/DogmgLE1Ne3O95Mj+Iyn4ez7jLVDwGZLG7PGldRz+RNEGLNDl mR1cFEfXTV6KjxFlSyVQpEkn//B2fjpT/j8VuX0KtQlI0wmKO/ShBn/diKvA+meg 0Lr+hKdcymoJOHCt8yOxzgQ9bzCzHLW4GoaQN9AdlaJst+tCyJzW/n9MhLRGKcTz ++pG7CYBcFrVk/FWONo/uKC8nrZQ1DJoN8pUNYY62R6H+xm/zFIk2oDiOxyf8J8c CLHj75ihvUQpweyRzxBO8zZX1j5MVc1PO54A5w0FSKehE4gHIFXGUI48PRaEXyFr rDTLg== X-ME-Sender: <xms:NSVnalUxYIhTBairp9Qy4xIRBgUx8obeSLWc5TRDd7a9x3720-8Utg> <xme:NSVnajiofdXUT3yvCESG8O6lazCZ8FL0d1S62mI0P9N9MoVApFHBBqrMNnmpfY0Xy SESpqpmOMR5vyH3BZ3mpYhj7RN5Zj2owjl9wcayQyzUlbxukiYgog> X-ME-Received: <xmr:NSVnao9tCVly5qmpbEGPwoGof_wzpF3xNOW3CPQIWZMeV6eNJnPX72MSSLc77hRsErnC4KYl74Kd> X-ME-Proxy-Cause: dmFkZTG27B2C6AYmNnB6KtLii5NtilMVtpM7YROTDeI1K9y2pTfwz+s+/fVWkOKRRMm6oY z2CPnIOBTGag1nT1c8NSQqWD3XxUBFBYxB25gMGRnKm6cDzd0UCm+FJ8oYxyPNdv6KQr4U 4/OvKrIf7goaqyrzVv6i4YGO6ksRQzWikPd+/8QtqJRxZpffYmXjH6lpNIqtG0wTdV8ePu 4ngX6ymge2Kmb66SqfeM+iKtuRbN3/bWYYN0ConRvJtv2midNMAmC1Dwk4Se6nL81HLy7d YbMYF5OExUe3y/89F0/gegjc+6z5Ok3SC7iErWxdikJBze8oxf2WpcyoOf7zLdwt9U1JWd nAI1DZEVJhFBslECWYOQLUBARSFT422VY5G4iugPH6cphIrZZ3Y1TOnrfGsd2AGpw2J492 ARuZyT7GGaHJzT567gpeqtVi5eVSat1uajDYoneT6S08nPLwToZX5SU7NXQov08TcZ6BLf BP2FEH2cp7J98FAk/KRxKXDALgq8i5U7VEnu4UQgIW0B6EnNlh9UBnw9epVP9jmVtoIqBS nd6CluZGnWq0yOy5oZLqPr5cLv5nLBUt7bRde8syjillJGznTSRE9VDZ2Y0aBMfh5kfa/s /jOHHEQhjfH1Q+0oMGmbJ4sUWE18R1BnOdmvVj7X3ThJeXzAHR0pa6gZv+cw X-ME-Proxy: <xmx:NSVnalAL3gCDlT8lJJxFomrnd3n9TsJBvO2UzsYVQs2nNiE-lEZijQ> <xmx:NSVnatJjCYb7AZtcApcDM4x30gOL20zdR0KnUaPxwvwxto-4cdU0YA> <xmx:NSVnagkkGFUW7l1gvFEB-vw8jY3_ZL3kxCzp6ijK0toFBMvvWJGqnA> <xmx:NSVnajF2cSbxJElJL-2pLS6qBriVM59McMzFjZrd-SS3RrsprsG6cg> <xmx:NiVnalupyP7k5gbLDkB4z_i8tT5ykHyZj4MRDuExg6FTk-XM9L0pl_4n> Feedback-ID: i62564b17:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 27 Jul 2026 05:30:29 -0400 (EDT) Received: by melete.silentflame.com (Postfix, from userid 1000) id 93D397E809F; Mon, 27 Jul 2026 10:30:28 +0100 (BST) From: Sean Whitton <spwhitton@HIDDEN> To: Paul Eggert <eggert@HIDDEN>, 81480 <at> debbugs.gnu.org Subject: Re: bug#81480: 31.0.91; diff-mode-test-* incorrectly assumes "diff -a" In-Reply-To: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN> References: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN> Date: Mon, 27 Jul 2026 10:30:28 +0100 Message-ID: <875x20u6dn.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 81480 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Paul Eggert [24/Jul 1:55pm -07] wrote: > This follows up on bug#81465 "31.0.91; =E2=80=98make check=E2=80=99 failu= res on Solaris > 10 sparc 32-bit" and I am splitting this issue off into a separate bug > report. > > Some diff-mode-test-* patches fail because they use =E2=80=98diff -a=E2= =80=99. The -a > option is a GNU extension to POSIX and is not supported by Solaris 10 dif= f. I don't understand what you mean by saying that they *use* 'diff -a' -- if it's -a that turns on the "No newline at end of file" output, then the problem has to be that -a is the implicit default behaviour for GNU diff? AFAICT we don't explicitly pass -a anywhere. --=20 Sean Whitton
bug-gnu-emacs@HIDDEN:bug#81480; Package emacs.
Full text available.
Received: (at 81480) by debbugs.gnu.org; 26 Jul 2026 14:06:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jul 26 10:06:45 2026
Received: from localhost ([127.0.0.1]:58900 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1wnzV5-0002df-3J
for submit <at> debbugs.gnu.org; Sun, 26 Jul 2026 10:06:45 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:52184)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1wnzUz-0002bs-CH
for 81480 <at> debbugs.gnu.org; Sun, 26 Jul 2026 10:06:40 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
id 1wnzUt-0000eU-M8; Sun, 26 Jul 2026 10:06:31 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From:
Date; bh=kKQHOTUH8HujDj7zu12vrmdWF+QzWY/tEcSyrFl/OE0=; b=N9fRuj6FDtICjH3vDwe9
5JZuxg9e4MORuKj7uUUSzkWh1AXNyx6oxqYPM8YurgG7PxHuP37nwsRA2t6MX9SyynEm1g+0QI/5P
CkDpTNLl3wVZl+67esZ8owPqymoWSZw1VZWigY4yE81Ed9B01YFkDB1Dlogo6p3Fq41iYwf1VDnzK
RY9qa6yLy0h2zeGSxU309SurksOWHTyYOMjnl/qttJnQ8UW4UmijYEm2FkgpQtJbKAmzqlyIzcfUM
DW2EiAV44NhajSxLvH0aLU9gu6Ztn+x/TiiAp4YN33CulKbEhyBU+wBdtBTXPIPTxypc6ivdcRHMT
9F+wWNuVbnq5tw==;
Date: Sun, 26 Jul 2026 17:06:25 +0300
Message-Id: <86tsplrgke.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Paul Eggert <eggert@HIDDEN>,
Stefan Monnier <monnier@HIDDEN>,
Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN> (message from
Paul Eggert on Fri, 24 Jul 2026 13:55:01 -0700)
Subject: Re: bug#81480: 31.0.91; diff-mode-test-* incorrectly assumes "diff -a"
References: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 81480
Cc: 81480 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
> Date: Fri, 24 Jul 2026 13:55:01 -0700
> From: Paul Eggert <eggert@HIDDEN>
>
> This follows up on bug#81465 "31.0.91; ‘make check’ failures on Solaris
> 10 sparc 32-bit" and I am splitting this issue off into a separate bug
> report.
>
> Some diff-mode-test-* patches fail because they use ‘diff -a’. The -a
> option is a GNU extension to POSIX and is not supported by Solaris 10 diff.
Does the patch below make the situation better?
> Test diff-mode-test-font-lock-syntax-one-line backtrace:
> signal(ert-test-failed (((should (equal-including-properties (buffer
> ert-fail(((should (equal-including-properties (buffer-string) #("@@
> #f(compiled-function () #<bytecode -0x1806dcb2>)()
> #f(compiled-function () #<bytecode 0x105d20f5>)()
> handler-bind-1(#f(compiled-function () #<bytecode 0x105d20f5>) (t) #
> ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
> ert-run-test(#s(ert-test :name diff-mode-test-font-lock-syntax-one-l
> ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
> ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n
> ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) (
> ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
> eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
> command-line-1(("-L" ":../../emacs-31.0.91/test" "-l" "ert" "--eval"
> command-line()
> normal-top-level()
> Test diff-mode-test-font-lock-syntax-one-line condition:
> (ert-test-failed
> ((should
> (equal-including-properties (buffer-string)
> #("@@ -1 +1 @@\n-int main() { printf(\"Hello, World!\\n\");
> return 0; }\n\\ No newline at end of file\n+int main() { printf(\"Hello,
> Emacs!\\n\"); return 0; }\n\\ No newline at end of file\n"
> 0 11 ... 12 13 ... 13 65 ... 65 93
> ... 93 94 ... 94 146 ... 146 174 ...)))
> :form
> (equal-including-properties
> #("@@ -1,1 +1,1 @@\n-int main() { printf(\"Hello, World!\\n\");
> return 0; }\n+int main() { printf(\"Hello, Emacs!\\n\"); return 0; }\n"
> 0 15 (face diff-hunk-header) 16 17 (face diff-indicator-removed)
> 17 69 (face diff-removed) 69 70 (face diff-indicator-added) 70
> 122 (face diff-added))
> #("@@ -1 +1 @@\n-int main() { printf(\"Hello, World!\\n\");
> return 0; }\n\\ No newline at end of file\n+int main() { printf(\"Hello,
> Emacs!\\n\"); return 0; }\n\\ No newline at end of file\n"
> 0 11 (face diff-hunk-header) 12 13 (face diff-indicator-removed)
> 13 65 (face diff-removed) 65 93 (face diff-context) 93 94
> (face diff-indicator-added) 94 146 (face diff-added) 146 174
> (face diff-context)))
> :value nil :explanation
> (arrays-of-different-length 122 174
> #("@@ -1,1 +1,1 @@\n-int main() { printf(\"Hello, World!\\n\");
> return 0; }\n+int main() { printf(\"Hello, Emacs!\\n\"); return 0; }\n"
> 0 15 (face diff-hunk-header) 16 17
> (face diff-indicator-removed) 17 69
> (face diff-removed) 69 70
> (face diff-indicator-added) 70 122
> (face diff-added))
> "@@ -1 +1 @@\n-int main() { printf(\"Hello, World!\\n\"); return
> 0; }\n\\ No newline at end of file\n+int main() { printf(\"Hello,
> Emacs!\\n\"); return 0; }\n\\ No newline at end of file\n"
> first-mismatch-at 5)))
> FAILED 6/14 diff-mode-test-font-lock-syntax-one-line (0.138542
> sec) at ../../emacs-31.0.91/test/lisp/vc/diff-mode-tests.el:413
This test seems to assume GNU Diff, because "No newline at end of
file" is specific to that version, right? So we should skip this when
Diff is not GNU Diff.
diff --git a/test/lisp/vc/diff-mode-tests.el b/test/lisp/vc/diff-mode-tests.el
index 36291fe..9a02c17 100644
--- a/test/lisp/vc/diff-mode-tests.el
+++ b/test/lisp/vc/diff-mode-tests.el
@@ -352,6 +352,7 @@ diff-mode-test-font-lock
:failed :passed)
(skip-unless (executable-find shell-file-name))
(skip-unless (executable-find diff-command))
+ (skip-unless (zerop (call-process diff-command nil nil nil "-a" "." ".")))
(let ((default-directory (ert-resource-directory))
(old "hello_world.c")
(new "hello_emacs.c")
@@ -612,6 +613,7 @@ diff-mode-tests--git-patch
")
(ert-deftest diff-mode-test-git-patch ()
+ (skip-unless (zerop (call-process diff-command nil nil nil "-a" "." ".")))
(with-temp-buffer
(insert diff-mode-tests--git-patch)
(diff-mode)
@@ -625,6 +627,7 @@ diff-mode-test-git-patch
'diff-added))))
(ert-deftest diff-mode-test-git-patch/before-first-hunk ()
+ (skip-unless (zerop (call-process diff-command nil nil nil "-a" "." ".")))
(with-temp-buffer
(insert diff-mode-tests--git-patch)
(diff-mode)
@@ -639,6 +642,7 @@ diff-mode-test-git-patch/before-first-hunk
'diff-context))))
(ert-deftest diff-mode-test-git-patch/signature ()
+ (skip-unless (zerop (call-process diff-command nil nil nil "-a" "." ".")))
(with-temp-buffer
(insert diff-mode-tests--git-patch)
(diff-mode)
bug-gnu-emacs@HIDDEN:bug#81480; Package emacs.
Full text available.
Received: (at submit) by debbugs.gnu.org; 24 Jul 2026 20:55:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 24 16:55:16 2026
Received: from localhost ([127.0.0.1]:43344 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1wnMvL-0000Gn-28
for submit <at> debbugs.gnu.org; Fri, 24 Jul 2026 16:55:16 -0400
Received: from lists1p.gnu.org ([2001:470:142::17]:48300)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <eggert@HIDDEN>)
id 1wnMvH-0000Dw-0i
for submit <at> debbugs.gnu.org; Fri, 24 Jul 2026 16:55:12 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <eggert@HIDDEN>)
id 1wnMvB-0007dR-4u
for bug-gnu-emacs@HIDDEN; Fri, 24 Jul 2026 16:55:05 -0400
Received: from mail.cs.ucla.edu ([131.179.128.66])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <eggert@HIDDEN>)
id 1wnMv8-0005QA-Lh
for bug-gnu-emacs@HIDDEN; Fri, 24 Jul 2026 16:55:04 -0400
Received: from localhost (localhost [127.0.0.1])
by mail.cs.ucla.edu (Postfix) with ESMTP id 898AC3C00E42F
for <bug-gnu-emacs@HIDDEN>; Fri, 24 Jul 2026 13:55:01 -0700 (PDT)
Received: from mail.cs.ucla.edu ([127.0.0.1])
by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP
id TVVWQQXe-CP6 for <bug-gnu-emacs@HIDDEN>;
Fri, 24 Jul 2026 13:55:01 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by mail.cs.ucla.edu (Postfix) with ESMTP id 635063C00E430
for <bug-gnu-emacs@HIDDEN>; Fri, 24 Jul 2026 13:55:01 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 635063C00E430
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu;
s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1784926501;
bh=ercnpPqjfmd/GTfqbs2cT6OcRv1o3Wm67HeTKIbQptk=;
h=Message-ID:Date:MIME-Version:To:From;
b=Z5TsBmNEan23YFuNLuC32GYoZbjHItKItvlGnHfZBd4hO28TOLb6LYb38IuwBPVl4
p1lAsIDKPNNRFHx0iIhZvduR/r/p2sEkBQQxvrbS+MZgfjKy3mgPkjbPTk8kVWyvDx
PpYVRGXEOZrFpWAntMLsRxcpwHuvYgnNhEkkJ1fRskMo6UWmj6K+7E0/ShpactUPTF
SXbrrJ2ATrqBYx8+QmqlAsjQ4ziN4/HVVVJyvzxqnLfu4ISo3ZW50YdhqJTpMnAoTb
2FyyVPK5va4jU9KAWH75XByKltuKjNfKr/1EIY630GUEfdsSN/B11FM4CWHCAcHAQT
W8WN+Qq9wyr6Q==
X-Virus-Scanned: amavis at mail.cs.ucla.edu
Received: from mail.cs.ucla.edu ([127.0.0.1])
by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP
id 4sYlAFoOxYQd for <bug-gnu-emacs@HIDDEN>;
Fri, 24 Jul 2026 13:55:01 -0700 (PDT)
Received: from penguin.cs.ucla.edu
(47-154-25-11.fdr01.snmn.ca.ip.frontiernet.net [47.154.25.11])
by mail.cs.ucla.edu (Postfix) with ESMTPSA id 4A5FC3C00E42F
for <bug-gnu-emacs@HIDDEN>; Fri, 24 Jul 2026 13:55:01 -0700 (PDT)
Message-ID: <1013bfdf-ef2c-47ac-b08a-32648c42c89c@HIDDEN>
Date: Fri, 24 Jul 2026 13:55:01 -0700
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
To: Emacs bug reports and feature requests <bug-gnu-emacs@HIDDEN>
From: Paul Eggert <eggert@HIDDEN>
Subject: 31.0.91; diff-mode-test-* incorrectly assumes "diff -a"
Organization: UCLA Computer Science Department
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=131.179.128.66; envelope-from=eggert@HIDDEN;
helo=mail.cs.ucla.edu
X-Spam_score_int: -42
X-Spam_score: -4.3
X-Spam_bar: ----
X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
This follows up on bug#81465 "31.0.91; =E2=80=98make check=E2=80=99 failu=
res on Solaris=20
10 sparc 32-bit" and I am splitting this issue off into a separate bug=20
report.
Some diff-mode-test-* patches fail because they use =E2=80=98diff -a=E2=80=
=99. The -a
option is a GNU extension to POSIX and is not supported by Solaris 10 dif=
f.
Here's the relevant part of the log file:
GEN lisp/vc/diff-mode-tests.log
Running 14 tests (2026-07-23 15:15:17-0700, selector `(not (or (tag=20
:expensive-test) (tag :unstable) (tag :nativecomp)))')
Hunk undone
Hunk undone
passed 1/14 diff-mode-test-bottommost-addition-undo (0.039462 sec)
passed 2/14 diff-mode-test-find-file-name-create (0.006596 sec)
passed 3/14 diff-mode-test-fixups-added-lines (0.001277 sec)
passed 4/14 diff-mode-test-fixups-empty-hunks (0.001065 sec)
Test diff-mode-test-font-lock backtrace:
signal(error ("Unexpected patch hunk header: /usr/bin/diff: illegal
error("Unexpected patch hunk header: %s" "/usr/bin/diff: illegal opt
smerge--refine-apply-diff-1(#<killed buffer> #<overlay from 462 to 4
smerge--refine-apply-diff(#<killed buffer> #<overlay from 462 to 492
smerge-refine-regions(462 492 492 522 nil diff-refine-preproc ((diff
diff--refine-hunk(411 538 skip-if-large)
#f(compiled-function (beg end) #<bytecode 0x1893c5a7>)(411 538)
diff--iterate-hunks(580 #f(compiled-function (beg end) #<bytecode 0x
diff--font-lock-refined(580)
font-lock-fontify-keywords-region(1 580 nil)
font-lock-default-fontify-region(1 580 nil)
font-lock-fontify-region(1 580)
#f(compiled-function (beg end) #<bytecode 0xf8af205>)(1 580)
font-lock-ensure()
#f(compiled-function () #<bytecode 0x1476dc36>)()
#f(compiled-function () #<bytecode 0x105d20f5>)()
handler-bind-1(#f(compiled-function () #<bytecode 0x105d20f5>) (t) #
ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
ert-run-test(#s(ert-test :name diff-mode-test-font-lock :documentati
ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n
ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) (
ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
command-line-1(("-L" ":../../emacs-31.0.91/test" "-l" "ert" "--eval"
command-line()
normal-top-level()
Test diff-mode-test-font-lock condition:
(error
"Unexpected patch hunk header: /usr/bin/diff: illegal option -- a")
FAILED 5/14 diff-mode-test-font-lock (0.732802 sec) at=20
../../emacs-31.0.91/test/lisp/vc/diff-mode-tests.el:346
Test diff-mode-test-font-lock-syntax-one-line backtrace:
signal(ert-test-failed (((should (equal-including-properties (buffer
ert-fail(((should (equal-including-properties (buffer-string) #("@@
#f(compiled-function () #<bytecode -0x1806dcb2>)()
#f(compiled-function () #<bytecode 0x105d20f5>)()
handler-bind-1(#f(compiled-function () #<bytecode 0x105d20f5>) (t) #
ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
ert-run-test(#s(ert-test :name diff-mode-test-font-lock-syntax-one-l
ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n
ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) (
ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
command-line-1(("-L" ":../../emacs-31.0.91/test" "-l" "ert" "--eval"
command-line()
normal-top-level()
Test diff-mode-test-font-lock-syntax-one-line condition:
(ert-test-failed
((should
(equal-including-properties (buffer-string)
#("@@ -1 +1 @@\n-int main() { printf(\"Hello, World!\\n\");=20
return 0; }\n\\ No newline at end of file\n+int main() { printf(\"Hello,=20
Emacs!\\n\"); return 0; }\n\\ No newline at end of file\n"
0 11 ... 12 13 ... 13 65 ... 65 93
... 93 94 ... 94 146 ... 146 174 ...)))
:form
(equal-including-properties
#("@@ -1,1 +1,1 @@\n-int main() { printf(\"Hello, World!\\n\");=20
return 0; }\n+int main() { printf(\"Hello, Emacs!\\n\"); return 0; }\n"
0 15 (face diff-hunk-header) 16 17 (face diff-indicator-removed)
17 69 (face diff-removed) 69 70 (face diff-indicator-added) 70
122 (face diff-added))
#("@@ -1 +1 @@\n-int main() { printf(\"Hello, World!\\n\");=20
return 0; }\n\\ No newline at end of file\n+int main() { printf(\"Hello,=20
Emacs!\\n\"); return 0; }\n\\ No newline at end of file\n"
0 11 (face diff-hunk-header) 12 13 (face diff-indicator-removed)
13 65 (face diff-removed) 65 93 (face diff-context) 93 94
(face diff-indicator-added) 94 146 (face diff-added) 146 174
(face diff-context)))
:value nil :explanation
(arrays-of-different-length 122 174
#("@@ -1,1 +1,1 @@\n-int main() { printf(\"Hello, World!\\n\");=20
return 0; }\n+int main() { printf(\"Hello, Emacs!\\n\"); return 0; }\n"
0 15 (face diff-hunk-header) 16 17
(face diff-indicator-removed) 17 69
(face diff-removed) 69 70
(face diff-indicator-added) 70 122
(face diff-added))
"@@ -1 +1 @@\n-int main() { printf(\"Hello, World!\\n\"); return=20
0; }\n\\ No newline at end of file\n+int main() { printf(\"Hello,=20
Emacs!\\n\"); return 0; }\n\\ No newline at end of file\n"
first-mismatch-at 5)))
FAILED 6/14 diff-mode-test-font-lock-syntax-one-line (0.138542=20
sec) at ../../emacs-31.0.91/test/lisp/vc/diff-mode-tests.el:413
Test diff-mode-test-git-patch backtrace:
signal(error ("Unexpected patch hunk header: /usr/bin/diff: illegal
error("Unexpected patch hunk header: %s" "/usr/bin/diff: illegal opt
smerge--refine-apply-diff-1(#<killed buffer> #<overlay in no buffer>
smerge--refine-apply-diff(#<killed buffer> #<overlay in no buffer> #
smerge-refine-regions(677 772 772 896 nil diff-refine-preproc ((diff
diff--refine-hunk(533 1497 skip-if-large)
#f(compiled-function (beg end) #<bytecode 0x1893c5a7>)(533 1497)
diff--iterate-hunks(1504 #f(compiled-function (beg end) #<bytecode 0
diff--font-lock-refined(1504)
font-lock-fontify-keywords-region(1 1504 nil)
font-lock-default-fontify-region(1 1504 nil)
font-lock-fontify-region(1 1504)
#f(compiled-function (beg end) #<bytecode 0xf8af205>)(1 1504)
font-lock-ensure()
#f(compiled-function () #<bytecode 0x19c73ec4>)()
#f(compiled-function () #<bytecode 0x105d20f5>)()
handler-bind-1(#f(compiled-function () #<bytecode 0x105d20f5>) (t) #
ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
ert-run-test(#s(ert-test :name diff-mode-test-git-patch :documentati
ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n
ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) (
ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
command-line-1(("-L" ":../../emacs-31.0.91/test" "-l" "ert" "--eval"
command-line()
normal-top-level()
Test diff-mode-test-git-patch condition:
(error
"Unexpected patch hunk header: /usr/bin/diff: illegal option -- a")
FAILED 7/14 diff-mode-test-git-patch (0.025659 sec) at=20
../../emacs-31.0.91/test/lisp/vc/diff-mode-tests.el:614
Test diff-mode-test-git-patch/before-first-hunk backtrace:
signal(error ("Unexpected patch hunk header: /usr/bin/diff: illegal
error("Unexpected patch hunk header: %s" "/usr/bin/diff: illegal opt
smerge--refine-apply-diff-1(#<killed buffer> #<overlay in no buffer>
smerge--refine-apply-diff(#<killed buffer> #<overlay in no buffer> #
smerge-refine-regions(677 772 772 896 nil diff-refine-preproc ((diff
diff--refine-hunk(533 1497 skip-if-large)
#f(compiled-function (beg end) #<bytecode 0x1893c5a7>)(533 1497)
diff--iterate-hunks(1504 #f(compiled-function (beg end) #<bytecode 0
diff--font-lock-refined(1504)
font-lock-fontify-keywords-region(1 1504 nil)
font-lock-default-fontify-region(1 1504 nil)
font-lock-fontify-region(1 1504)
#f(compiled-function (beg end) #<bytecode 0xf8af205>)(1 1504)
font-lock-ensure()
#f(compiled-function () #<bytecode -0x103daffd>)()
#f(compiled-function () #<bytecode 0x105d20f5>)()
handler-bind-1(#f(compiled-function () #<bytecode 0x105d20f5>) (t) #
ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
ert-run-test(#s(ert-test :name diff-mode-test-git-patch/before-first
ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n
ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) (
ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
command-line-1(("-L" ":../../emacs-31.0.91/test" "-l" "ert" "--eval"
command-line()
normal-top-level()
Test diff-mode-test-git-patch/before-first-hunk condition:
(error
"Unexpected patch hunk header: /usr/bin/diff: illegal option -- a")
FAILED 8/14 diff-mode-test-git-patch/before-first-hunk (0.025348=20
sec) at ../../emacs-31.0.91/test/lisp/vc/diff-mode-tests.el:627
Test diff-mode-test-git-patch/signature backtrace:
signal(error ("Unexpected patch hunk header: /usr/bin/diff: illegal
error("Unexpected patch hunk header: %s" "/usr/bin/diff: illegal opt
smerge--refine-apply-diff-1(#<killed buffer> #<overlay in no buffer>
smerge--refine-apply-diff(#<killed buffer> #<overlay in no buffer> #
smerge-refine-regions(677 772 772 896 nil diff-refine-preproc ((diff
diff--refine-hunk(533 1497 skip-if-large)
#f(compiled-function (beg end) #<bytecode 0x1893c5a7>)(533 1497)
diff--iterate-hunks(1504 #f(compiled-function (beg end) #<bytecode 0
diff--font-lock-refined(1504)
font-lock-fontify-keywords-region(1 1504 nil)
font-lock-default-fontify-region(1 1504 nil)
font-lock-fontify-region(1 1504)
#f(compiled-function (beg end) #<bytecode 0xf8af205>)(1 1504)
font-lock-ensure()
#f(compiled-function () #<bytecode 0x1657357a>)()
#f(compiled-function () #<bytecode 0x105d20f5>)()
handler-bind-1(#f(compiled-function () #<bytecode 0x105d20f5>) (t) #
ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
ert-run-test(#s(ert-test :name diff-mode-test-git-patch/signature :d
ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m
ert-run-tests((not (or (tag :expensive-test) (tag :unstable) (tag :n
ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable) (
ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
command-line-1(("-L" ":../../emacs-31.0.91/test" "-l" "ert" "--eval"
command-line()
normal-top-level()
Test diff-mode-test-git-patch/signature condition:
(error
"Unexpected patch hunk header: /usr/bin/diff: illegal option -- a")
FAILED 9/14 diff-mode-test-git-patch/signature (0.025096 sec) at=20
../../emacs-31.0.91/test/lisp/vc/diff-mode-tests.el:641
passed 10/14 diff-mode-test-hunk-text-no-newline (0.004113 sec)
Hunk applied
Hunk applied
Hunk applied
passed 11/14 diff-mode-test-ignore-trailing-dashes (0.061105 sec)
passed 12/14 diff-mode-test-setup-buffer-type (0.007701 sec)
Hunk undone
Hunk undone
passed 13/14 diff-mode-test-topmost-addition-undo (0.036086 sec)
passed 14/14 test-hunk-file-names (0.001423 sec)
Ran 14 tests, 9 results as expected, 5 unexpected (2026-07-23=20
15:15:23-0700, 5.656446 sec)
5 unexpected results:
FAILED diff-mode-test-font-lock
FAILED diff-mode-test-font-lock-syntax-one-line
FAILED diff-mode-test-git-patch
FAILED diff-mode-test-git-patch/before-first-hunk
FAILED diff-mode-test-git-patch/signature
gmake[4]: *** [lisp/vc/diff-mode-tests.log] Error 1
Paul Eggert <eggert@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#81480; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.