summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Le Blanc <lbarnaud@php.net>2008-09-12 12:17:07 +0000
committerArnaud Le Blanc <lbarnaud@php.net>2008-09-12 12:17:07 +0000
commitb08615c675b817383e41fee2e8a9b86b17972a7d (patch)
tree555118273684884503398d13241850f3da39df77
parentb861898fc705fa69cf58326a6c409d401f07b259 (diff)
downloadphp-git-b08615c675b817383e41fee2e8a9b86b17972a7d.tar.gz
MFH Fix test
-rw-r--r--ext/pcntl/tests/002.phpt27
1 files changed, 17 insertions, 10 deletions
diff --git a/ext/pcntl/tests/002.phpt b/ext/pcntl/tests/002.phpt
index c5731fb020..5fc1724daa 100644
--- a/ext/pcntl/tests/002.phpt
+++ b/ext/pcntl/tests/002.phpt
@@ -40,8 +40,19 @@ if ($pid == -1) {
var_dump($siginfo['pid'] === $pid);
pcntl_waitpid($pid, $status);
+ set_error_handler(function($errno, $errstr) { echo "Error triggered\n"; }, E_WARNING);
+
echo "sigprocmask with invalid arguments\n";
- var_dump(pcntl_sigprocmask(PHP_INT_MAX, array(SIGTERM)));
+
+ /* Valgrind expectedly complains about this:
+ * "sigprocmask: unknown 'how' field 2147483647"
+ * Skip */
+ if (getenv("USE_ZEND_ALLOC") !== '0') {
+ var_dump(pcntl_sigprocmask(PHP_INT_MAX, array(SIGTERM)));
+ } else {
+ echo "Error triggered\n";
+ echo "bool(false)\n";
+ }
var_dump(pcntl_sigprocmask(SIG_SETMASK, array(0)));
echo "sigwaitinfo with invalid arguments\n";
@@ -51,7 +62,7 @@ if ($pid == -1) {
var_dump(pcntl_sigtimedwait(array(SIGTERM), $signo, PHP_INT_MAX, PHP_INT_MAX));
} else {
$siginfo = NULL;
- pcntl_sigtimedwait(array(SIGTERM), $siginfo, PHP_INT_MAX, 999999999);
+ pcntl_sigtimedwait(array(SIGINT), $siginfo, PHP_INT_MAX, 999999999);
exit;
}
@@ -72,17 +83,13 @@ bool(true)
signo === pid
bool(true)
sigprocmask with invalid arguments
-
-Warning: pcntl_sigprocmask(): Invalid argument in %s on line %d
+Error triggered
bool(false)
-
-Warning: pcntl_sigprocmask(): Invalid argument in %s on line %d
+Error triggered
bool(false)
sigwaitinfo with invalid arguments
-
-Warning: pcntl_sigwaitinfo(): Invalid argument in %s on line %d
+Error triggered
bool(false)
sigtimedwait with invalid arguments
-
-Warning: pcntl_sigtimedwait(): Invalid argument in %s on line %d
+Error triggered
int(-1)