From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ZwgSCIXSW2EvgQAAgWs5BA (envelope-from ) for ; Tue, 05 Oct 2021 06:20:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id eA4SA4XSW2GKJQAAbx9fmQ (envelope-from ) for ; Tue, 05 Oct 2021 04:20:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5804C275A for ; Tue, 5 Oct 2021 06:20:19 +0200 (CEST) Received: from localhost ([::1]:45770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXbwA-0000TL-H1 for larch@yhetil.org; Tue, 05 Oct 2021 00:20:18 -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 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches From: Ryan Sundberg via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633407620; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Fk7gXarJCRcXrI6ViJaksvObJrEGIL91et1cT9DFrKA=; b=E4r3MpnzC1F+y/6GciJ1KEsb0Hpk4nMqztpBn0yVu92XuIjWQ4m3SdOMltlf+d22VieRUl pAyQRISAk8dMK5PX8vbyX0t6PiCzRA7H2Rzg5HrQH/92NeagK5IvqFpYd29ybuHy9FB2ID aHus7Ai7fDXn4Z+m4akIlYag9oaOFiKY/S6HQraNOJxgs8wygFgRIvCtC9mumpVCiQ+Oe2 c4MOhkfqk01x3A+02bZN6tXcmTcGt9SQWa67hzIsXT5WThgT9GIP4WpPjkCXvHdw6ysDsS WeOuK2gOLqTtJ0zgtlacHT2x/MHDDNNzPLnXXU9/HYoQRZdEte2wIQOaB80L8w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633407620; a=rsa-sha256; cv=none; b=WeuyU4QQpV61L+NMwfFIwzGBkg03GWreC42+mSvRCLR0OSQZ6Oz6k71stiFetim+O9GFl/ F7PztYSfdDKZNLHJ2I+a6Iq9njNt9ZxArWRa7QlhPfnKEE3yF0NdCdNfmrCcfjF2/mcIcR MtFqZZQ4eFD4Ff7fEzWiqdSLXX+pFKYThOEEJL4Z1bmWpOOLR+xVAu0rkw8T6EDBPaoSKb bINPmMKWvKl4+n40uGSd98Vfo5yKxLBE9C38t9hmqkODuQrBK8zu9/OmWO7xVwbrQWvx/f hBqrERxdHT+cATrhs1sd6tKWYfyTJX1DsXo21fz7GiBTPbz9Ez79hmy7jNc9bQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=arctype.co header.s=mail header.b=DRxGLQgp; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.49 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=arctype.co header.s=mail header.b=DRxGLQgp; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5804C275A X-Spam-Score: 0.49 X-Migadu-Scanner: scn1.migadu.com X-TUID: Lj8VtGvPJwR1 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