Skip to content

Commit

Permalink
Merge pull request #922 from naveensrinivasan/fixes-for-fake-warning
Browse files Browse the repository at this point in the history
Fixes for FAKE Xunit warning
  • Loading branch information
haacked committed Oct 2, 2015
2 parents a1ea8ea + 60844b4 commit 7f2ad11
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Target "Clean" (fun _ ->
)

open Fake.AssemblyInfoFile
open Fake.XUnit2Helper
open Fake.Testing

Target "AssemblyInfo" (fun _ ->
CreateCSharpAssemblyInfo "./SolutionInfo.cs"
Expand Down Expand Up @@ -88,22 +88,22 @@ Target "ConventionTests" (fun _ ->
!! (sprintf "./Octokit.Tests.Conventions/bin/%s/**/Octokit.Tests.Conventions.dll" buildMode)
|> xUnit2 (fun p ->
{p with
OutputDir = testResultsDir })
HtmlOutputPath = Some (testResultsDir @@ "xunit.html") })
)

Target "UnitTests" (fun _ ->
!! (sprintf "./Octokit.Tests/bin/%s/**/Octokit.Tests*.dll" buildMode)
|> xUnit2 (fun p ->
{p with
OutputDir = testResultsDir })
HtmlOutputPath = Some (testResultsDir @@ "xunit.html") })
)

Target "IntegrationTests" (fun _ ->
if hasBuildParam "OCTOKIT_GITHUBUSERNAME" && hasBuildParam "OCTOKIT_GITHUBPASSWORD" then
!! (sprintf "./Octokit.Tests.Integration/bin/%s/**/Octokit.Tests.Integration.dll" buildMode)
|> xUnit2 (fun p ->
{p with
OutputDir = testResultsDir
HtmlOutputPath = Some (testResultsDir @@ "xunit.html")
TimeOut = TimeSpan.FromMinutes 10.0 })
else
"The integration tests were skipped because the OCTOKIT_GITHUBUSERNAME and OCTOKIT_GITHUBPASSWORD environment variables are not set. " +
Expand Down

0 comments on commit 7f2ad11

Please sign in to comment.