From 490617c780586ca7c112b613464b2f5ea61e6d22 Mon Sep 17 00:00:00 2001 From: foobar Date: Sat, 18 Jun 2005 22:54:07 +0000 Subject: [PATCH] fix VPATH testing (partial MFH) --- run-tests.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/run-tests.php b/run-tests.php index 667d37463b..c6aee942ab 100755 --- a/run-tests.php +++ b/run-tests.php @@ -57,6 +57,9 @@ NO_PCRE_ERROR; exit; } +// store current directory +$CUR_DIR = getcwd(); + // change into the PHP source directory. if (getenv('TEST_PHP_SRCDIR')) { @@ -407,8 +410,10 @@ if (!getenv('NO_INTERACTION')) { if (substr(PHP_OS, 0, 3) != "WIN") { $automake = shell_exec('automake --version'); $autoconf = shell_exec('autoconf --version'); + /* Always use the generated libtool - Mac OSX uses 'glibtool' */ - $libtool = shell_exec('./libtool --version'); + $libtool = shell_exec($CUR_DIR . '/libtool --version'); + /* Try the most common flags for 'version' */ $flags = array('-v', '-V', '--version'); $cc_status=0; @@ -439,7 +444,7 @@ if (!getenv('NO_INTERACTION')) { $compression = 0; if ($just_save_results || !mail_qa_team($failed_tests_data, $compression, $status)) { - $output_file = 'php_test_results_' . date('Ymd') . ( $compression ? '.txt.gz' : '.txt' ); + $output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . ( $compression ? '.txt.gz' : '.txt' ); $fp = fopen($output_file, "w"); fwrite($fp, $failed_tests_data); fclose($fp); -- 2.40.0