maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1065 from PowerShell/andschwa/fix-start-psxunit

Browse source 
Fix and improve Start-PSxUnit
This commit is contained in:
Andy Schwartzmeyer 2016-06-01 12:10:30 -07:00
parent 6dac6bf58a 66ddfcdaff
commit 455f2238b7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build.psm1
View file

@ -53,7 +53,8 @@ function Start-PSBuild {
[string]$msbuildConfiguration = "Release"
)
git describe --dirty --abbrev=60 > "$psscriptroot/powershell.version"
# save Git description to file for PowerShell to include in PSVersionTable
git --git-dir="$PSScriptRoot/.git" describe --dirty --abbrev=60 > "$psscriptroot/powershell.version"
# simplify ParameterSetNames
if ($PSCmdlet.ParameterSetName -eq 'FullCLR') {
@ -335,22 +336,24 @@ function Start-PSxUnit {
return
}
$Arguments = "--configuration", "Linux", "-parallel", "none"
if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
$Verbose = "--verbose"
$Arguments += "-verbose"
}
$Content = Split-Path -Parent (Get-PSOutput)
$BuildArguments = "--configuration", "Linux"
$TestAruments = $BuildArguments + @("-parallel", "none")
if (-not (Test-Path $Content)) {
throw "PowerShell must be built before running tests!"
}
try {
Push-Location $PSScriptRoot/test/csharp
# Path manipulation to obtain test project output directory
$Output = Join-Path $pwd ((Split-Path -Parent (Get-PSOutput)) -replace (New-PSOptions).Top)
Write-Host "Output is $Output"
Write-Verbose "Output is $Output"
Start-NativeExecution { dotnet $Verbose build $BuildArguments }
Copy-Item -ErrorAction SilentlyContinue -Recurse -Path $Content/* -Include Modules,libpsl-native* -Destination $Output
Start-NativeExecution { dotnet $Verbose test $TestArguments }
Start-NativeExecution { dotnet test $Arguments }
if ($LASTEXITCODE -ne 0) {
throw "$LASTEXITCODE xUnit tests failed"