lbarnaud Fri Sep 12 12:17:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcntl/tests 002.phpt
Log:
MFH Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/002.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/pcntl/tests/002.phpt
diff -u php-src/ext/pcntl/tests/002.phpt:1.1.2.4
php-src/ext/pcntl/tests/002.phpt:1.1.2.5
--- php-src/ext/pcntl/tests/002.phpt:1.1.2.4 Mon Sep 8 12:08:41 2008
+++ php-src/ext/pcntl/tests/002.phpt Fri Sep 12 12:17:07 2008
@@ -40,8 +40,19 @@
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 @@
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 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
