From unknown Mon Jun 16 23:48:02 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#51023 <51023@debbugs.gnu.org> To: bug#51023 <51023@debbugs.gnu.org> Subject: Status: [PATCH] gnu: php: patch failing test case Reply-To: bug#51023 <51023@debbugs.gnu.org> Date: Tue, 17 Jun 2025 06:48:02 +0000 retitle 51023 [PATCH] gnu: php: patch failing test case reassign 51023 guix-patches submitter 51023 Ryan Sundberg severity 51023 normal tag 51023 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 05 00:19:09 2021 Received: (at submit) by debbugs.gnu.org; 5 Oct 2021 04:19:09 +0000 Received: from localhost ([127.0.0.1]:38762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXbv2-0005XM-RW for submit@debbugs.gnu.org; Tue, 05 Oct 2021 00:19:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:49176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXbuy-0005XC-7k for submit@debbugs.gnu.org; Tue, 05 Oct 2021 00:19:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXbux-0000RB-Rl for guix-patches@gnu.org; Tue, 05 Oct 2021 00:19:04 -0400 Received: from mail.arctype.co ([138.68.9.245]:46567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXbuv-0002R2-Fb for guix-patches@gnu.org; Tue, 05 Oct 2021 00:19:03 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 2AB1613B2BE; Tue, 5 Oct 2021 04:18:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=arctype.co; s=mail; t=1633407537; bh=jyU88rvThkfuFCwQu7LuDE778/kBEctBTvpl4jXTvco=; h=From:To:Cc:Subject:Date:From; b=DRxGLQgpnp53lfcJdk1Un/gaosB+Oy0y5XyqERFTvtiD+blg0bPQT6gDjRpQPOTYp gyfpQ+l2gSeLRfHz7Y2UVnImuG83NG/vHAKbPc6z3+317R5xQRXP93S9M/RgseiNdN mUvq/SCdnyIxqH06ig+RR7QhR84a+5p32uOf+khH4RiojJaLPU6XDoaRkHjr5UpFNW Z2cJ+ZePGJB64kchLfZllIPOdHPRJQJcedBD7RmAtAkvS+sRc4BQSzrNIT2NQDnFuI YTqmzDXn9sfu5mxnUP9oRX4dZN2StD7cmy+BBF2MJuLHo8YzzAmYqGpZ7gw0IBNC65 H/hnTDV/trT/Q== From: Ryan Sundberg To: guix-patches@gnu.org Subject: [PATCH] gnu: php: patch failing test case Date: Mon, 4 Oct 2021 21:18:45 -0700 Message-Id: <20211005041845.22648-1-ryan@arctype.co> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Ryan Sundberg X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Fixes a failing test case in php (Zend/tests/bug74093.phpt) See https://github.com/php/php-src/pull/7555/files for upstream status. * gnu/local.mk: Include patch file php-bug-74093-test.patch * gnu/packages/patches/php-bug-74093-test.patch: Patch file * gnu/packages/php.scm: Add patch to php --- gnu/local.mk | 1 + gnu/packages/patches/php-bug-74093-test.patch | 49 +++++++++++++++++++ gnu/packages/php.scm | 1 + 3 files changed, 51 insertions(+) create mode 100644 gnu/packages/patches/php-bug-74093-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index c9888100f7..63f9446686 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1589,6 +1589,7 @@ dist_patch_DATA = \ %D%/packages/patches/perl-reproducible-build-date.patch \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ + %D%/packages/patches/php-bug-74093-test.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ diff --git a/gnu/packages/patches/php-bug-74093-test.patch b/gnu/packages/patches/php-bug-74093-test.patch new file mode 100644 index 0000000000..48fb47c67e --- /dev/null +++ b/gnu/packages/patches/php-bug-74093-test.patch @@ -0,0 +1,49 @@ +From c641825c64e42627a2c9cac969b371ed532e0b57 Mon Sep 17 00:00:00 2001 +From: Ryan Sundberg +Date: Mon, 4 Oct 2021 20:12:25 -0700 +Subject: [PATCH] Zend/tests/bug74093.phpt: Fix failing test case + +This test case fails (on non-Windows hosts, where it is enabled) due +to mismatching output in the error log language. This fixes the +expectation, and also rewrites the test procedure in a more stable +fashion. + +The objective of the test case is to run a program that exceeds +the max_execution_time and verify that the process was aborted. The +previous implementation tested this using a loop on array_intersect with +large enough inputs to "probably" take enough time to trigger +max_execution_time to abort it. With faster CPUs, over time this test +can become flaky. Instead we simply spin a loop until enough +wall clock time has passed to check our assertion. +--- + Zend/tests/bug74093.phpt | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Zend/tests/bug74093.phpt b/Zend/tests/bug74093.phpt +index 7f20285805..32eb445ddc 100644 +--- a/Zend/tests/bug74093.phpt ++++ b/Zend/tests/bug74093.phpt +@@ -1,5 +1,5 @@ + --TEST-- +-Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log) ++Bug #74093 (Maximum execution time exceeded not written in error_log) + --SKIPIF-- + + --EXPECTF-- +-Fatal error: Maximum execution time of 1+1 seconds exceeded %s ++Fatal error: Maximum execution time of 1 second exceeded in %s +-- +2.31.1 + diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 89fa978bd2..e6df1e6666 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -69,6 +69,7 @@ (sha256 (base32 "1s5xjy1cchlg0vfxic73wy2wip8spfjr094hzzyc76plsbbqq1wf")) + (patches (search-patches "php-bug-74093-test.patch")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 05 07:56:42 2021 Received: (at 51023-done) by debbugs.gnu.org; 5 Oct 2021 11:56:42 +0000 Received: from localhost ([127.0.0.1]:39217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXj3p-0005mM-Tr for submit@debbugs.gnu.org; Tue, 05 Oct 2021 07:56:42 -0400 Received: from tobias.gr ([80.241.217.52]:52570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXj3k-0005m8-Ru for 51023-done@debbugs.gnu.org; Tue, 05 Oct 2021 07:56:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=T5bSUEUEtaY+P AznMF0juhYkedmdTujEkg4o4W186fA=; h=in-reply-to:date:subject:cc:to: from:references; d=tobias.gr; b=IxP82SlIh8Syb7Mjz6n3bC6ukUGYN9TgOFNd6I zG1TJWh1gMFT1NvZv2xFtotppo0ZOYjdczqjL/1hrTY/phHcdNQBdgzm+hiU1PmzVypCg7 VR0d/bmzz+scbii9vF03z/zFGj32fy816GshDzFVVL6vgPZSHvivQOXDNEdTPQLJxx2lhQ jkUrL1130+UU1+HZiBbdd3fpzP59s/eJzZ49M5dr96c2J8Ur8nhoaMBHMb1jn8qs0AoPvi E1tYG3T0cufuN1srOQgVhQHccBPyQU/RkHBLmLdoH1AtoR1zXFVodI8e35jWtXMjQr+lGZ 7gpwuzGefDVI3+SsKvbotsiw== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id ded6a219 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Tue, 5 Oct 2021 11:56:32 +0000 (UTC) References: <20211005041845.22648-1-ryan@arctype.co> From: Tobias Geerinckx-Rice To: Ryan Sundberg Subject: Re: [bug#51023] [PATCH] gnu: php: patch failing test case Date: Tue, 05 Oct 2021 13:47:24 +0200 In-reply-to: <20211005041845.22648-1-ryan@arctype.co> BIMI-Selector: v=BIMI1; s=default; Message-ID: <87pmsjr8fx.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51023-done Cc: 51023-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Ryan, Ryan Sundberg via Guix-patches via =E5=86=99=E9=81=93=EF=BC=9A > Fixes a failing test case in php (Zend/tests/bug74093.phpt) > See https://github.com/php/php-src/pull/7555/files for upstream=20 > status. Thanks! PHP is notorious for sleep 4 # this is how long x took to y on my laptop in 2014 but it's the bane of many test suites (and, hence, us)=E2=80=A6 > * gnu/local.mk: Include patch file php-bug-74093-test.patch > * gnu/packages/patches/php-bug-74093-test.patch: Patch file > * gnu/packages/php.scm: Add patch to php Thanks for writing a GNU/Guix-style commit message. I made only a=20 few tweaks, mainly adding full stops and (section)[things]. gnu: php: Patch failing test case. Fixes a failing test case in PHP (Zend/tests/bug74093.phpt).=20 See for upstream=20 status. * gnu/packages/php.scm (php)[source]: Add patch. * gnu/packages/patches/php-bug-74093-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. The * line order is just what I'm used to writing, nothing more. Pushed as 9aaf402a379b9ac9e4c3eee5b16f7496d7606e91! Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCYVw9gg0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15Yn4BAIfUpPS2VGvmUyAUWBGOB5WU9iNSa6cjbvcszIiK KHf2AQCvEet6clVHip/JPq34iGBYpktQQrxO86ZyzmKOjcPeDg== =VpEE -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 16 23:48:02 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 03 Nov 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator