svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt
branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt trunk/ext/standard/tests/general_functions/bug39322.phpt
| From: | Nuno Lopes | Date: | Sun, 08 Jan 2012 18:03:56 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt trunk/ext/standard/tests/general_functions/bug39322.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67416@lists.php.net to get a copy of this message | ||
nlopess Sun, 08 Jan 2012 18:03:56 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=321933
Log:
do kill 9 to fix a race condition in this test. (should fix the debian 32-bit buildbot)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt
U php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt 2012-01-08
16:46:40 UTC (rev 321932)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug39322.phpt 2012-01-08
18:03:56 UTC (rev 321933)
@@ -16,7 +16,7 @@
$process = proc_open('/bin/sleep 120', $descriptors, $pipes);
-proc_terminate($process);
+proc_terminate($process, 9);
sleep(1); // wait a bit to let the process finish
var_dump(proc_get_status($process));
@@ -38,7 +38,7 @@
["exitcode"]=>
int(-1)
["termsig"]=>
- int(15)
+ int(9)
["stopsig"]=>
int(0)
}
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt 2012-01-08
16:46:40 UTC (rev 321932)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug39322.phpt 2012-01-08
18:03:56 UTC (rev 321933)
@@ -16,7 +16,7 @@
$process = proc_open('/bin/sleep 120', $descriptors, $pipes);
-proc_terminate($process);
+proc_terminate($process, 9);
sleep(1); // wait a bit to let the process finish
var_dump(proc_get_status($process));
@@ -38,7 +38,7 @@
["exitcode"]=>
int(-1)
["termsig"]=>
- int(15)
+ int(9)
["stopsig"]=>
int(0)
}
Modified: php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt 2012-01-08 16:46:40 UTC
(rev 321932)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug39322.phpt 2012-01-08 18:03:56 UTC
(rev 321933)
@@ -16,7 +16,7 @@
$process = proc_open('/bin/sleep 120', $descriptors, $pipes);
-proc_terminate($process);
+proc_terminate($process, 9);
sleep(1); // wait a bit to let the process finish
var_dump(proc_get_status($process));
@@ -38,7 +38,7 @@
["exitcode"]=>
int(-1)
["termsig"]=>
- int(15)
+ int(9)
["stopsig"]=>
int(0)
}