cvs: php-src(PHP_5_0) / run-tests.php
| From: | Ilia Alshanetsky | Date: | Sun, 20 Mar 2005 19:47:25 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31030@lists.php.net to get a copy of this message | ||
iliaa Sun Mar 20 14:47:25 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src run-tests.php
Log:
MFH: Detect shtool properly when build-dir != php source dir.
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.195.2.5&r2=1.195.2.6&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.195.2.5 php-src/run-tests.php:1.195.2.6
--- php-src/run-tests.php:1.195.2.5 Tue Feb 22 20:17:20 2005
+++ php-src/run-tests.php Sun Mar 20 14:47:24 2005
@@ -478,7 +478,7 @@
$libtool = shell_exec($_SERVER['PWD'] . '/libtool --version');
/* Use shtool to find out if there is glibtool present (MacOSX) */
- $sys_libtool_path = shell_exec("{$_SERVER['PWD']}/build/shtool path glibtool
libtool");
+ $sys_libtool_path = shell_exec(dirname(__FILE__) . "/build/shtool path glibtool
libtool");
$sys_libtool = shell_exec(str_replace("\n", "", $sys_libtool_path) . '
--version');
/* Try the most common flags for 'version' */