lstrojny Wed Mar 5 20:10:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
Using new magic constant __DIR__ in run-tests.php
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.17&r2=1.226.2.37.2.35.2.18&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.17
php-src/run-tests.php:1.226.2.37.2.35.2.18
--- php-src/run-tests.php:1.226.2.37.2.35.2.17 Sun Feb 24 12:17:25 2008
+++ php-src/run-tests.php Wed Mar 5 20:10:12 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.17 2008/02/24 12:17:25 felipe Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.18 2008/03/05 20:10:12 lstrojny 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
@@ -198,7 +198,7 @@
global $cwd, $php, $php_cgi, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test, $leak_check, $valgrind_header;
// Get info from php
- $info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
+ $info_file = __DIR__ . '/run-test-info.php';
@unlink($info_file);
$php_info = '<?php echo "
PHP_SAPI : " . PHP_SAPI . "
@@ -441,7 +441,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.17
$'."\n";
+ echo '$Revision: 1.226.2.37.2.35.2.18
$'."\n";
exit(1);
case 'u':
@@ -777,7 +777,7 @@
$libtool = shell_exec($CUR_DIR . '/libtool --version');
/* Use shtool to find out if there is glibtool present
(MacOSX) */
- $sys_libtool_path = shell_exec(dirname(__FILE__) .
'/build/shtool path glibtool libtool');
+ $sys_libtool_path = shell_exec(__DIR__ . '/build/shtool
path glibtool libtool');
if ($sys_libtool_path) {
$sys_libtool = shell_exec(str_replace("\n", "",
$sys_libtool_path) . ' --version');
}
@@ -1183,7 +1183,7 @@
$temp_clean = $temp_dir . DIRECTORY_SEPARATOR .
$main_file_name.'clean.php';
$test_clean = $test_dir . DIRECTORY_SEPARATOR .
$main_file_name.'clean.php';
$tmp_post = $temp_dir . DIRECTORY_SEPARATOR . uniqid('/phpt.');
- $tmp_relative_file = str_replace(dirname(__FILE__).DIRECTORY_SEPARATOR,
'', $test_file) . 't';
+ $tmp_relative_file = str_replace(__DIR__ . DIRECTORY_SEPARATOR, '',
$test_file) . 't';
if ($temp_source && $temp_target) {
$temp_skipif .= 's';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
