From 4e6f0d2a87b781e743fbc2812120aca59b40fb21 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Fri, 1 Nov 2013 10:06:41 -0700 Subject: [PATCH] Remove xunit from cibuild.ps1 I had copied this code from GHfW where we had some timeout issues with the unit tests. That's not a problem with Octokit. By running our FullBuild, we still get test coverage with no need to duplicate xunit code here. --- script/cibuild.ps1 | 50 +--------------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/script/cibuild.ps1 b/script/cibuild.ps1 index 5212d2ab..6f8f4f8e 100644 --- a/script/cibuild.ps1 +++ b/script/cibuild.ps1 @@ -72,7 +72,7 @@ if ($Clean) { Write-Output "Building Octokit..." Write-Output "" -$output = .\Build-Solution.ps1 Build Release -MSBuildVerbosity quiet 2>&1 +$output = .\Build-Solution.ps1 FullBuild Release -MSBuildVerbosity quiet 2>&1 if ($LastExitCode -ne 0) { $exitCode = $LastExitCode @@ -84,54 +84,6 @@ if ($LastExitCode -ne 0) { Die-WithOutput $exitCode $output } -function Run-XUnit([string]$platform, [string]$project, [int]$timeoutDuration, [string]$projectFolder = $project) { - $dll = "$projectFolder\bin\Release\$platform\$project.dll" - - $xunitDirectory = Join-Path $rootDirectory tools\xunit - $consoleRunner = Join-Path $xunitDirectory xunit.console.clr4.x86.exe - $xml = Join-Path $rootDirectory "nunit-$project.xml" - - $output=(& $consoleRunner $dll /nunit $xml /silent /noshadow) - - $result = New-Object System.Object - $result | Add-Member -Type NoteProperty -Name Output -Value $output - $result | Add-Member -Type NoteProperty -Name ExitCode -Value $LastExitCode - $result -} - $exitCode = 0 -Write-Output "Running Octokit.Tests..." -$result = Run-XUnit Net45 Octokit.Tests 120 -if ($result.ExitCode -eq 0) { - # Print out the test result summary. - Write-Output $result.Output[-1] -} else { - $exitCode = $result.ExitCode - Write-Output $result.Output -} -Write-Output "" - -Write-Output "Running Octokit.Tests-NetCore45..." -$result = Run-XUnit NetCore45 Octokit.Tests-NetCore45 120 Octokit.Tests -if ($result.ExitCode -eq 0) { - # Print out the test result summary. - Write-Output $result.Output[-1] -} else { - $exitCode = $result.ExitCode - Write-Output $result.Output -} -Write-Output "" - -Write-Output "Running Octokit.Tests.Integration..." -$result = Run-XUnit Net45 Octokit.Tests.Integration 180 -if ($result.ExitCode -eq 0) { - # Print out the test result summary. - Write-Output $result.Output[-1] -} else { - $exitCode = $result.ExitCode - Write-Output $result.Output -} -Write-Output "" - exit $exitCode