- If user wnats help, don't complain about missing environment

1 files changed, 8 insertions, 6 deletions

diff --git a/run-tests.php b/run-tests.php
index 02235d248e..ffc63f0446 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -109,8 +109,14 @@ if (getenv('TEST_PHP_EXECUTABLE')) {
 	}
 }
 
-if (empty($php) || !file_exists($php)) {
-	error("environment variable TEST_PHP_EXECUTABLE must be set to specify PHP executable!");
+if ($argc !=2 || ($argv[1] != '-h' && $argv[1] != '-help' && $argv != '--help'))
+{
+	if (empty($php) || !file_exists($php)) {
+		error("environment variable TEST_PHP_EXECUTABLE must be set to specify PHP executable!");
+	}
+	if (function_exists('is_executable') && !@is_executable($php)) {
+		error("invalid PHP executable specified by TEST_PHP_EXECUTABLE  = " . $php);
+	}
 }
 
 if (getenv('TEST_PHP_LOG_FORMAT')) {
@@ -119,10 +125,6 @@ if (getenv('TEST_PHP_LOG_FORMAT')) {
 	$log_format = 'LEOD';
 }
 
-if (function_exists('is_executable') && !@is_executable($php)) {
-	error("invalid PHP executable specified by TEST_PHP_EXECUTABLE  = " . $php);
-}
-
 // Check whether a detailed log is wanted.
 if (getenv('TEST_PHP_DETAILED')) {
 	$DETAILED = getenv('TEST_PHP_DETAILED');