Skip to content

Commit

Permalink
Fix issues in tests.xml and OpenConsole.psm1 (#9011)
Browse files Browse the repository at this point in the history
* Fix the incorrect terminalCore path in tests.xml
* Change the -TaefArgs argument of Invoke-OpenConsoleTests and
  Invoke-TaefInNewWindow to be []string, allowing
  multiple arguments to be passed to TAEF
  • Loading branch information
lhecker committed Feb 4, 2021
1 parent 779354d commit 6197108
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions tools/OpenConsole.psm1
Expand Up @@ -116,7 +116,7 @@ function Invoke-TaefInNewWindow()
[string]$TestDll,

[parameter(Mandatory=$false)]
[string]$TaefArgs
[string[]]$TaefArgs
)

Start-Process $OpenConsolePath -Wait -ArgumentList "powershell.exe $TaefPath $TestDll $TaefArgs; Read-Host 'Press enter to continue...'"
Expand Down Expand Up @@ -163,7 +163,7 @@ function Invoke-OpenConsoleTests()
[string]$Test,

[parameter(Mandatory=$false)]
[string]$TaefArgs,
[string[]]$TaefArgs,

[parameter(Mandatory=$false)]
[ValidateSet('x64', 'x86')]
Expand All @@ -188,7 +188,6 @@ function Invoke-OpenConsoleTests()
$TestHostAppPath = "$env:OpenConsoleRoot\$Configuration\TestHostApp"
}
$OpenConsolePath = "$env:OpenConsoleroot\bin\$OpenConsolePlatform\$Configuration\OpenConsole.exe"
$RunTePath = "$env:OpenConsoleRoot\tools\runte.cmd"
$TaefExePath = "$env:OpenConsoleRoot\packages\Taef.Redist.Wlk.10.57.200731005-develop\build\Binaries\$Platform\te.exe"
$BinDir = "$env:OpenConsoleRoot\bin\$OpenConsolePlatform\$Configuration"

Expand Down
2 changes: 1 addition & 1 deletion tools/tests.xml
Expand Up @@ -2,7 +2,7 @@
<tests>
<test name="host" type="unit" binary="Conhost.Unit.Tests.dll" />
<test name="textBuffer" type="unit" binary="TextBuffer.Unit.Tests.dll" />
<test name="terminalCore" type="unit" binary="Terminal.Core.Unit.Tests.dll" />
<test name="terminalCore" type="unit" binary="UnitTests_TerminalCore\Terminal.Core.Unit.Tests.dll" />
<test name="terminalApp" type="unit" binary="UnitTests_TerminalApp\Terminal.App.Unit.Tests.dll" />
<test name="localTerminalApp" type="unit" runInHostApp="true" binary="TerminalApp.LocalTests.dll" />
<test name="localSettingsModel" type="unit" runInHostApp="true" binary="SettingsModel.LocalTests.dll" />
Expand Down

0 comments on commit 6197108

Please sign in to comment.