From patchwork Tue Oct 5 04:18:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 33609 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 558E827BBE3; Tue, 5 Oct 2021 05:20:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8E8327BBE1 for ; Tue, 5 Oct 2021 05:20:31 +0100 (BST) Received: from localhost ([::1]:45770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXbwM-0000TL-OP for patchwork@mira.cbaines.net; Tue, 05 Oct 2021 00:20:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXbvu-0000TC-Tb for guix-patches@gnu.org; Tue, 05 Oct 2021 00:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55449) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXbvu-0003JU-I2 for guix-patches@gnu.org; Tue, 05 Oct 2021 00:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mXbvu-0005YZ-8G for guix-patches@gnu.org; Tue, 05 Oct 2021 00:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51023] [PATCH] gnu: php: patch failing test case Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Oct 2021 04:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51023 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51023@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163340754921292 (code B ref -1); Tue, 05 Oct 2021 04:20:02 +0000 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== Date: Mon, 4 Oct 2021 21:18:45 -0700 Message-Id: <20211005041845.22648-1-ryan@arctype.co> MIME-Version: 1.0 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches 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"