Skip to content

Commit f9a9c90

Browse files
committed
Add more try/finally in DotCover
The problem is the same for other test runners than NUnit so the same fix is now applied.
1 parent 5504a11 commit f9a9c90

File tree

1 file changed

+32
-29
lines changed

1 file changed

+32
-29
lines changed

src/app/FakeLib/DotCover.fs

+32-29
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ let DotCoverReport (setParams: DotCoverReportParams -> DotCoverReportParams) =
182182
let DotCoverNUnit (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUnitParams: NUnitParams -> NUnitParams) (assemblies: string seq) =
183183
let assemblies = assemblies |> Seq.toArray
184184
let details = assemblies |> separated ", "
185-
186185
traceStartTask "DotCoverNUnit" details
186+
187187
try
188188
let parameters = NUnitDefaults |> setNUnitParams
189189
let args = buildNUnitdArgs parameters assemblies
@@ -213,8 +213,8 @@ let DotCoverNUnit (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUni
213213
let DotCoverNUnit3 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setNUnitParams: NUnit3Params -> NUnit3Params) (assemblies: string seq) =
214214
let assemblies = assemblies |> Seq.toArray
215215
let details = assemblies |> separated ", "
216-
217216
traceStartTask "DotCoverNUnit3" details
217+
218218
try
219219
let parameters = NUnit3Defaults |> setNUnitParams
220220
let args = buildNUnit3Args parameters assemblies
@@ -244,16 +244,17 @@ let DotCoverXUnit2 (setDotCoverParams: DotCoverParams -> DotCoverParams) (setXUn
244244
let details = assemblies |> separated ", "
245245
traceStartTask "DotCoverXUnit2" details
246246

247-
let parameters = XUnit2Defaults |> setXUnit2Params
248-
let args = buildXUnit2Args assemblies parameters
247+
try
248+
let parameters = XUnit2Defaults |> setXUnit2Params
249+
let args = buildXUnit2Args assemblies parameters
249250

250-
DotCover (fun p ->
251-
{p with
252-
TargetExecutable = parameters.ToolPath
253-
TargetArguments = args
254-
} |> setDotCoverParams)
255-
256-
traceEndTask "DotCoverXUnit2" details
251+
DotCover (fun p ->
252+
{p with
253+
TargetExecutable = parameters.ToolPath
254+
TargetArguments = args
255+
} |> setDotCoverParams)
256+
finally
257+
traceEndTask "DotCoverXUnit2" details
257258

258259
/// Builds the command line arguments from the given parameter record and the given assemblies.
259260
/// Runs all test assemblies in the same run for easier coverage management.
@@ -291,16 +292,17 @@ let DotCoverMSTest (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMST
291292
let details = assemblies |> separated ", "
292293
traceStartTask "DotCoverMSTest " details
293294

294-
let parameters = MSTestDefaults |> setMSTestParams
295-
let args = buildMSTestArgsForDotCover parameters assemblies
295+
try
296+
let parameters = MSTestDefaults |> setMSTestParams
297+
let args = buildMSTestArgsForDotCover parameters assemblies
296298

297-
DotCover (fun p ->
298-
{p with
299-
TargetExecutable = parameters.ToolPath
300-
TargetArguments = args
301-
} |> setDotCoverParams)
302-
303-
traceEndTask "DotCoverMSTest" details
299+
DotCover (fun p ->
300+
{p with
301+
TargetExecutable = parameters.ToolPath
302+
TargetArguments = args
303+
} |> setDotCoverParams)
304+
finally
305+
traceEndTask "DotCoverMSTest" details
304306

305307
/// Runs the dotCover "cover" command against the MSpec test runner.
306308
/// ## Parameters
@@ -321,14 +323,15 @@ let DotCoverMSpec (setDotCoverParams: DotCoverParams -> DotCoverParams) (setMSpe
321323
let details = assemblies |> separated ", "
322324
traceStartTask "DotCoverMSpec" details
323325

324-
let parameters = MSpecDefaults |> setMSpecParams
326+
try
327+
let parameters = MSpecDefaults |> setMSpecParams
325328

326-
let args = buildMSpecArgs parameters assemblies
329+
let args = buildMSpecArgs parameters assemblies
327330

328-
DotCover (fun p ->
329-
{p with
330-
TargetExecutable = parameters.ToolPath
331-
TargetArguments = args
332-
} |> setDotCoverParams)
333-
334-
traceEndTask "DotCoverMSpec" details
331+
DotCover (fun p ->
332+
{p with
333+
TargetExecutable = parameters.ToolPath
334+
TargetArguments = args
335+
} |> setDotCoverParams)
336+
finally
337+
traceEndTask "DotCoverMSpec" details

0 commit comments

Comments
 (0)