Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Team city bug and additions #651

Merged
merged 2 commits into from
Feb 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/app/FakeLib/TeamCityHelper.fs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,45 @@ let sendTeamCityNUnitImport path = sendToTeamCity "##teamcity[importData type='n
/// Sends an FXCop results filename to TeamCity
let sendTeamCityFXCopImport path = sendToTeamCity "##teamcity[importData type='FxCop' path='%s']" path

/// Sends an JUnit Ant task results filename to TeamCity
let sendTeamCityJUnitImport path = sendToTeamCity "##teamcity[importData type='junit' path='%s']" path

/// Sends an Maven Surefire results filename to TeamCity
let sendTeamCitySurefireImport path = sendToTeamCity "##teamcity[importData type='surefire' path='%s']" path

/// Sends an MSTest results filename to TeamCity
let sendTeamCityMSTestImport path = sendToTeamCity "##teamcity[importData type='mstest' path='%s']" path

/// Sends an Google Test results filename to TeamCity
let sendTeamCityGTestImport path = sendToTeamCity "##teamcity[importData type='gtest' path='%s']" path

/// Sends an Checkstyle results filename to TeamCity
let sendTeamCityCheckstyleImport path = sendToTeamCity "##teamcity[importData type='checkstyle' path='%s']" path

/// Sends an FindBugs results filename to TeamCity
let sendTeamCityFindBugsImport path = sendToTeamCity "##teamcity[importData type='findBugs' path='%s']" path

/// Sends an JSLint results filename to TeamCity
let sendTeamCityJSLintImport path = sendToTeamCity "##teamcity[importData type='jslint' path='%s']" path

/// Sends an ReSharper inspectCode.exe results filename to TeamCity
let sendTeamCityReSharperInspectCodeImport path = sendToTeamCity "##teamcity[importData type='ReSharperInspectCode' path='%s']" path

/// Sends an FxCop inspection results filename to TeamCity
let sendTeamCityFxCopImport path = sendToTeamCity "##teamcity[importData type='FxCop' path='%s']" path

/// Sends an PMD inspections results filename to TeamCity
let sendTeamCityPmdImport path = sendToTeamCity "##teamcity[importData type='pmd' path='%s']" path

/// Sends an PMD Copy/Paste Detector results filename to TeamCity
let sendTeamCityPmdCpdImport path = sendToTeamCity "##teamcity[importData type='pmdCpd' path='%s']" path

/// Sends an ReSharper dupfinder.exe results filename to TeamCity
let sendTeamCityDotNetDupFinderImport path = sendToTeamCity "##teamcity[importData type='DotNetDupFinder' path='%s']" path

/// Sends an dotcover, partcover, ncover or ncover3 results filename to TeamCity
let sendTeamCityDotNetCoverageImport path = sendToTeamCity "##teamcity[importData type='dotNetCoverage' path='%s']" path

/// Starts the test case.
let StartTestCase testCaseName =
sendToTeamCity "##teamcity[testStarted name='%s' captureStandardOutput='true']" testCaseName
Expand Down
2 changes: 1 addition & 1 deletion src/app/FakeLib/UnitTest/NUnit/Parallel.fs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ let NUnitParallel (setParams : NUnitParams -> NUnitParams) (assemblies : string
| [] -> ()
| _ ->
File.WriteAllText(getWorkingDir parameters @@ parameters.OutputFile, sprintf "%O" (NUnitMerge.mergeXDocs docs))
sendTeamCityNUnitImport (getWorkingDir parameters @@ parameters.OutputFile)
sendTeamCityNUnitImport parameters.OutputFile
// Make sure we delete the temp files
testRunResults
|> List.map (fun x -> x.OutputFile)
Expand Down
2 changes: 1 addition & 1 deletion src/app/FakeLib/UnitTest/NUnit/Sequential.fs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ let NUnit (setParams : NUnitParams -> NUnitParams) (assemblies : string seq) =
info.FileName <- tool
info.WorkingDirectory <- getWorkingDir parameters
info.Arguments <- args) parameters.TimeOut
sendTeamCityNUnitImport (getWorkingDir parameters @@ parameters.OutputFile)
sendTeamCityNUnitImport parameters.OutputFile
let errorDescription error =
match error with
| OK -> "OK"
Expand Down