jon Mon Jul 11 02:32:03 2005 EDT
Modified files:
/php-src run-tests.php
Log:
Removing the automake-related output. The build no longer uses automake.
While I'm here, rewrite the PHP_AUTOCONF-related code to more closely
match the conventions used elsewhere in this section. The result should
be functionally the same as before.
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.221&r2=1.222&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.221 php-src/run-tests.php:1.222
--- php-src/run-tests.php:1.221 Fri Jul 8 22:41:19 2005
+++ php-src/run-tests.php Mon Jul 11 02:32:02 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.221 2005/07/09 02:41:19 sniper Exp $ */
+/* $Id: run-tests.php,v 1.222 2005/07/11 06:32:02 jon Exp $ */
/*
* TODO:
@@ -497,16 +497,15 @@
$failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep;
$failed_tests_data .= "OS:\n" . PHP_OS . " - " . php_uname() .
"\n\n";
- $ldd = $automake = $autoconf = $sys_libtool = $libtool =
$compiler = 'N/A';
+ $ldd = $autoconf = $sys_libtool = $libtool = $compiler = 'N/A';
if (substr(PHP_OS, 0, 3) != "WIN") {
- /* Determine the names of the autotools executables. */
- $automake = (!empty($_ENV['PHP_AUTOMAKE'])) ?
$_ENV['PHP_AUTOMAKE'] : 'automake';
- $autoconf = (!empty($_ENV['PHP_AUTOCONF'])) ?
$_ENV['PHP_AUTOCONF'] : 'autoconf';
-
- /* Extract the tools' versions (overwriting our local
variables). */
- $automake = shell_exec("$automake --version");
- $autoconf = shell_exec("$autoconf --version");
+ /* If PHP_AUTOCONF is set, use it; otherwise, use
'autoconf'. */
+ if (!empty($_ENV['PHP_AUTOCONF'])) {
+ $autoconf = shell_exec($_ENV['PHP_AUTOCONF'] .
' --version');
+ } else {
+ $autoconf = shell_exec('autoconf --version');
+ }
/* Always use the generated libtool - Mac OSX uses
'glibtool' */
$libtool = shell_exec($CUR_DIR . '/libtool --version');
@@ -527,7 +526,6 @@
}
$ldd = shell_exec("ldd $php 2>/dev/null");
}
- $failed_tests_data .= "Automake:\n$automake\n";
$failed_tests_data .= "Autoconf:\n$autoconf\n";
$failed_tests_data .= "Bundled Libtool:\n$libtool\n";
$failed_tests_data .= "System Libtool:\n$sys_libtool\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
