From 76803ef109773cf9e56959cf3c06f4d51d88ada7 Mon Sep 17 00:00:00 2001 From: Simon Bridewell Date: Sat, 27 Dec 2014 20:36:37 +0000 Subject: [PATCH] Add -mergebyhash command line option when running PartCover, to avoid trying to add the same assembly to the code coverage results more than once. See http://community.sharpdevelop.net/forums/p/22003/56296.aspx --- .../Analysis/CodeCoverage/Project/Src/OpenCoverApplication.cs | 2 +- .../CodeCoverage/Test/Testing/OpenCoverApplicationTests.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverApplication.cs b/src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverApplication.cs index fdd2a97d49..805ac8e593 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverApplication.cs +++ b/src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverApplication.cs @@ -104,7 +104,7 @@ namespace ICSharpCode.CodeCoverage string GetArguments() { // IMPORTANT: https://github.com/sawilde/opencover/wiki/Usage - arguments = new StringBuilder("-register:user "); + arguments = new StringBuilder("-register:user -mergebyhash "); AppendTarget(); AppendTargetWorkingDirectory(); diff --git a/src/AddIns/Analysis/CodeCoverage/Test/Testing/OpenCoverApplicationTests.cs b/src/AddIns/Analysis/CodeCoverage/Test/Testing/OpenCoverApplicationTests.cs index 68fffe4340..001f04105e 100644 --- a/src/AddIns/Analysis/CodeCoverage/Test/Testing/OpenCoverApplicationTests.cs +++ b/src/AddIns/Analysis/CodeCoverage/Test/Testing/OpenCoverApplicationTests.cs @@ -163,7 +163,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing ProcessStartInfo processStartInfo = openCoverApp.GetProcessStartInfo(); string expectedCommandLine = - "-register:user -target:\"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " + + "-register:user -mergebyhash -target:\"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " + "-targetdir:\"c:\\projects\\MyTests\\bin\\Debug\" " + "-targetargs:\"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml\" " + "-output:\"c:\\projects\\MyTests\\OpenCover\\coverage.xml\" " + @@ -187,7 +187,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing ProcessStartInfo processStartInfo = openCoverApp.GetProcessStartInfo(); string expectedCommandLine = - "-register:user -target:\"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " + + "-register:user -mergebyhash -target:\"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " + "-targetdir:\"c:\\projects\\MyTests\\bin\\Debug\" " + "-targetargs:\"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml\" " + "-output:\"c:\\projects\\MyTests\\OpenCover\\coverage.xml\" " +