Fix PHP version and sapi printed so that it does not print bogus

version and sapi name.

2 files changed, 23 insertions, 2 deletions

diff --git a/run-tests.php b/run-tests.php
index 79e0f5b249..0fd24ba2a7 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -284,8 +284,8 @@ function do_testing($argc, &$argv)
     dowriteln(sprintf("Tests passed:     %4d (%s%%)", $passed, $passed_pstr));
     dowriteln("=============================");
     dowriteln("Skipped ".sizeof($skipped_extensions)." extensions.");
-	dowriteln("PHP SAPI: ".PHP_SAPI);
-    dowriteln("PHP Version: ".PHP_VERSION);
+	$php_bin_info_cmd = "$php -q -f tests/bin-info.inc";
+	system($php_bin_info_cmd, $ret);
 }
 
 function find_testdirs($dir = '.', $first_pass = true)
diff --git a/tests/bin-info.inc b/tests/bin-info.inc
new file mode 100644
index 0000000000..ad42ea897a
--- /dev/null
+++ b/tests/bin-info.inc
@@ -0,0 +1,21 @@
+<?php
+// Used to print php binary info used to run
+// test scripts.
+// Called from run-tests.php
+
+function dowrite($str)
+{
+    global $term_bold, $term_norm;
+    $str = str_replace("%b", $term_bold, $str);
+    $str = str_replace("%B", $term_norm, $str);
+    print $str;
+}
+
+function dowriteln($str)
+{
+    dowrite("$str\n");
+}
+
+dowriteln("PHP SAPI: ".PHP_SAPI);
+dowriteln("PHP Version: ".PHP_VERSION);
+?>
\ No newline at end of file