diff options
| author | Ryan Sundberg via Guix-patches via <guix-patches@gnu.org> | 2021-10-04 21:18:45 -0700 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-05 13:45:29 +0200 |
| commit | 9aaf402a379b9ac9e4c3eee5b16f7496d7606e91 (patch) | |
| tree | 81cc38b5e2102771ec7e0d2223a9199155372a65 | |
| parent | 220424a7803f94c293f26962e5a3eb32f26b4493 (diff) | |
| download | guix-9aaf402a379b9ac9e4c3eee5b16f7496d7606e91.tar.gz guix-9aaf402a379b9ac9e4c3eee5b16f7496d7606e91.zip | |
gnu: php: Patch failing test case.
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/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.
Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/php-bug-74093-test.patch | 48 | ||||
| -rw-r--r-- | gnu/packages/php.scm | 1 |
3 files changed, 50 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 3491bdae62..91915e780b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1594,6 +1594,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..07b1949cef --- /dev/null +++ b/gnu/packages/patches/php-bug-74093-test.patch @@ -0,0 +1,48 @@ +From c641825c64e42627a2c9cac969b371ed532e0b57 Mon Sep 17 00:00:00 2001 +From: Ryan Sundberg <ryan@arctype.co> +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-- + <?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +@@ -12,9 +12,9 @@ max_execution_time=1 + hard_timeout=1 + --FILE-- + <?php +-$a1 = range(1, 1000000); +-$a2 = range(100000, 1999999); +-array_intersect($a1, $a2); ++$start = time(); ++while (time() - $start < 5); ++die("Failed to interrupt execution"); + ?> + --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" |