[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] [php-src] master: Merge branch 'PHP-8.1'
From:       Jakub Zelenka <noreply () php ! net>
Date:       2022-04-27 18:21:29
Message-ID: JHPofK0QB5HcBc73OmszhYAEeYiv2qu4fFF9YXZqE8 () main ! php ! net
[Download RAW message or body]

Author: Jakub Zelenka (bukka)
Date: 2022-04-27T19:17:33+01:00

Commit: https://github.com/php/php-src/commit/09d313daac89b4934d9f34bc7b2ec622f015eb22
 Raw diff: https://github.com/php/php-src/commit/09d313daac89b4934d9f34bc7b2ec622f015eb22.diff


Merge branch 'PHP-8.1'

Changed paths:
  M  sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt
  M  sapi/fpm/tests/proc-idle-timeout.phpt


Diff:

diff --git a/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt \
b/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt index \
                6fc084934357..cb33a2f6635a 100644
--- a/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt
+++ b/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt
@@ -6,6 +6,7 @@ pcntl
 <?php
 include "skipif.inc";
 if (!function_exists('pcntl_sigprocmask')) die('skip Requires pcntl_sigprocmask()');
+if (!getenv("FPM_RUN_RESOURCE_HEAVY_TESTS")) die("skip resource heavy test");
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 ?>
 --FILE--
diff --git a/sapi/fpm/tests/proc-idle-timeout.phpt \
b/sapi/fpm/tests/proc-idle-timeout.phpt index 2c49a19b1de7..0c1d10cab874 100644
--- a/sapi/fpm/tests/proc-idle-timeout.phpt
+++ b/sapi/fpm/tests/proc-idle-timeout.phpt
@@ -3,8 +3,8 @@ FPM: Process manager config pm.process_idle_timeout
 --SKIPIF--
 <?php
 include "skipif.inc";
+if (!getenv("FPM_RUN_RESOURCE_HEAVY_TESTS")) die("skip resource heavy test");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-if (!getenv("FPM_LOCAL_TESTS")) die("skip local test")
 ?>
 --FILE--
 <?php

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]