Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement

weltling · weltling · commit 8f146c2bb0dc · 2013-09-20T15:59:33.000+02:00
Patch by Pierre Renaudet
diff --git a/sapi/cli/tests/cli_process_title_windows.phpt b/sapi/cli/tests/cli_process_title_windows.phpt
@@ -20,15 +20,16 @@ if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
 // no warnings/errors.
 
 $is_windows8 = false;
-$ps_output = shell_exec("PowerShell \"(Get-Host).UI.RawUI.WindowTitle\"");
+$ps_output = shell_exec("PowerShell -NoProfile \"(Get-Host).UI.RawUI.WindowTitle\"");
 if ($ps_output === null)
 {
   echo "Get-Host failed\n";
   die();
 }
 
 $ps_output = trim($ps_output);
-if (($ps_output == "Windows PowerShell") || ($ps_output == "Administrator: Windows PowerShell"))
+$end_title_windows8 = ": Windows PowerShell";
+if (($ps_output == "Windows PowerShell") || (strlen($ps_output) > strlen($end_title_windows8) && substr($ps_output,-strlen($end_title_windows8)) === $end_title_windows8))
   $is_windows8 = true;
 
 echo "*** Testing setting the process title ***\n";
@@ -45,7 +46,7 @@ if ($is_windows8)
 }
 else
 {
-  $loaded_title = shell_exec("PowerShell \"get-process cmd*,powershell* | Select-Object mainWindowTitle | ft -hide\"");
+  $loaded_title = shell_exec("PowerShell -NoProfile \"get-process cmd*,powershell* | Select-Object mainWindowTitle | ft -hide\"");
 
   if ($loaded_title === null)
   {

Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,16 @@ if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')`
`20`	`20`	`// no warnings/errors.`
`21`	`21`
`22`	`22`	`$is_windows8 = false;`
`23`		`-$ps_output = shell_exec("PowerShell \"(Get-Host).UI.RawUI.WindowTitle\"");`
	`23`	`+$ps_output = shell_exec("PowerShell -NoProfile \"(Get-Host).UI.RawUI.WindowTitle\"");`
`24`	`24`	`if ($ps_output === null)`
`25`	`25`	`{`
`26`	`26`	`echo "Get-Host failed\n";`
`27`	`27`	`die();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`$ps_output = trim($ps_output);`
`31`		`-if (($ps_output == "Windows PowerShell") \|\| ($ps_output == "Administrator: Windows PowerShell"))`
	`31`	`+$end_title_windows8 = ": Windows PowerShell";`
	`32`	`+if (($ps_output == "Windows PowerShell") \|\| (strlen($ps_output) > strlen($end_title_windows8) && substr($ps_output,-strlen($end_title_windows8)) === $end_title_windows8))`
`32`	`33`	`$is_windows8 = true;`
`33`	`34`
`34`	`35`	`echo "* Testing setting the process title *\n";`
`@@ -45,7 +46,7 @@ if ($is_windows8)`
`45`	`46`	`}`
`46`	`47`	`else`
`47`	`48`	`{`
`48`		`- $loaded_title = shell_exec("PowerShell \"get-process cmd,powershell \| Select-Object mainWindowTitle \| ft -hide\"");`
	`49`	`+ $loaded_title = shell_exec("PowerShell -NoProfile \"get-process cmd,powershell \| Select-Object mainWindowTitle \| ft -hide\"");`
`49`	`50`
`50`	`51`	`if ($loaded_title === null)`
`51`	`52`	`{`