helly Fri Nov 15 09:24:21 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4 run-tests.php
Log:
MFH: Show Zend version
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.119.2.4 php4/run-tests.php:1.119.2.5
--- php4/run-tests.php:1.119.2.4 Fri Nov 15 05:39:19 2002
+++ php4/run-tests.php Fri Nov 15 09:24:20 2002
@@ -105,6 +105,7 @@
$php_info = '<?php echo "
PHP_SAPI : " . PHP_SAPI . "
PHP_VERSION : " . phpversion() . "
+ZEND_VERSION: " . zend_version() . "
PHP_OS : " . PHP_OS . "
INI actual : " . realpath(get_cfg_var("cfg_file_path")) . "
More .INIs : " . (function_exists(\'php_ini_scanned_files\') ? str_replace("\n","",
php_ini_scanned_files()) : "** not determined **"); ?>';
@@ -335,17 +336,7 @@
$failed_tests_data = '';
$sep = "\n" . str_repeat('=', 80) . "\n";
- $failed_tests_data .= $failed_test_summary . "\n";
-
- foreach ($GLOBALS['__PHP_FAILED_TESTS__'] as $test_info) {
- $failed_tests_data .= $sep . $test_info['name'];
- $failed_tests_data .= $sep .
file_get_contents(realpath($test_info['output']));
- $failed_tests_data .= $sep .
file_get_contents(realpath($test_info['diff']));
- $failed_tests_data .= $sep . "\n\n";
- }
-
- $failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep;
- $failed_tests_data .= "OS:\n". PHP_OS. "\n\n";
+ $failed_tests_data .= "OS:\n". PHP_OS. "\n";
$automake = $autoconf = $libtool = $compiler = 'N/A';
if (substr(PHP_OS, 0, 3) != "WIN") {
$automake = shell_exec('automake --version');
@@ -368,6 +359,15 @@
$failed_tests_data .= "Compiler:\n$compiler\n";
$failed_tests_data .= "Bison:\n". @shell_exec('bison --version'). "\n";
$failed_tests_data .= "\n\n";
+
+ $failed_tests_data .= $failed_test_summary . "\n";
+
+ foreach ($GLOBALS['__PHP_FAILED_TESTS__'] as $test_info) {
+ $failed_tests_data .= $sep . $test_info['name'];
+ $failed_tests_data .= $sep .
+file_get_contents(realpath($test_info['output']));
+ $failed_tests_data .= $sep .
+file_get_contents(realpath($test_info['diff']));
+ $failed_tests_data .= $sep . "\n\n";
+ }
$failed_tests_data .= $sep . "PHPINFO" . $sep;
$failed_tests_data .= shell_exec($php.' -dhtml_errors=0 -i');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
