1 files changed, 11 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php
index 8d62de7163..cdcd674ed8 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2161,7 +2161,17 @@ function settings2params(&$ini_settings)
 				$settings .= " -d \"$name=$val\"";
 			}
 		} else {
-			$value = addslashes($value);
+			if (substr(PHP_OS, 0, 3) == "WIN" && !empty($value) && $value{0} == '"') {
+				$len = strlen($value);
+
+				if ($value{$len - 1} == '"') {
+					$value{0} = "'";
+					$value{$len - 1} = "'";
+				}
+			} else {
+				$value = addslashes($value);
+			}
+
 			$settings .= " -d \"$name=$value\"";
 		}
 	}