tony2001 Thu Apr 12 13:17:15 2007 UTC Modified files: /php-src run-tests.php Log: bail out if unicode.semantics is On (stream_select() is unable to cast Unicode streams to FDs) check stream_select() return value correctly and avoid endless loop http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.316&r2=1.317&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.316 php-src/run-tests.php:1.317 --- php-src/run-tests.php:1.316 Tue Mar 27 20:27:39 2007 +++ php-src/run-tests.php Thu Apr 12 13:17:14 2007 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.316 2007/03/27 20:27:39 helly Exp $ */ +/* $Id: run-tests.php,v 1.317 2007/04/12 13:17:14 tony2001 Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -82,6 +82,10 @@ error_reporting(E_ALL); ini_set('magic_quotes_runtime',0); // this would break tests by modifying EXPECT sections +if (ini_get("unicode.semantics")) { + error("It is currently not possible to use run-tests.php with unicode.semantics=On. Please turn it Off and re-run the tests."); +} + $environment = isset($_ENV) ? $_ENV : array(); // Don't ever guess at the PHP executable location. @@ -401,7 +405,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.316 $'."\n"; + echo '$Revision: 1.317 $'."\n"; exit(1); default: echo "Illegal switch specified!\n"; @@ -869,7 +873,9 @@ $e = null; $n = @stream_select($r, $w, $e, $leak_check ? 300 : 60); - if ($n === 0) { + if ($n === false) { + break; + } else if ($n === 0) { /* timed out */ $data .= "\n ** ERROR: process timed out **\n"; proc_terminate($proc);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php