Merge pull request #809 from iainx/better-coverage-filtering

Better coverage filtering
mono · Mar 17, 2015 · f5b1efb · f5b1efb
2 parents fba50d7 + b12da35
commit f5b1efb
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 1 deletion.
diff --git a/main/tests/.gitignore b/main/tests/.gitignore
@@ -1 +1,3 @@
+CoverageResult*.mlpd
+CoverageResult*.xml
 TestResult*.xml
diff --git a/main/tests/ICSharpCode.NRefactory.Tests.dll.filter b/main/tests/ICSharpCode.NRefactory.Tests.dll.filter
@@ -0,0 +1,5 @@
++ICSharpCode.NRefactory
++ICSharpCode.NRefactory.CSharp
++ICSharpCode.NRefactory.IKVM
++ICSharpCode.NRefactory.Xml
+-ICSharpCode.NRefactory.Tests
diff --git a/main/tests/Ide.Tests.dll.filter b/main/tests/Ide.Tests.dll.filter
@@ -0,0 +1 @@
++MonoDevelop.Ide
diff --git a/main/tests/Makefile.am b/main/tests/Makefile.am
@@ -73,7 +73,8 @@ coverage:
 	if ! test -n "$(assembly)"; then \
 		for asm in $(TEST_ASSEMBLIES); do \
 			echo Generating coverage for `basename $$asm`...; \
-			($(MD_LAUNCH_SETUP) exec -a "mdtool" $(RUNTIME) --debug --profile=log:coverage,output=CoverageResult_`basename $$asm`.mlpd "$(MD_BIN_PATH)/mdtool.exe" run-md-tests $$asm); \
+			($(MD_LAUNCH_SETUP) exec -a "mdtool" $(RUNTIME) --debug --profile=log:coverage,onlycoverage,output=CoverageResult_`basename $$asm`.mlpd,ffile=`basename $$asm`.filter "$(MD_BIN_PATH)/mdtool.exe" run-md-tests $$asm); \
+			mprof-report --coverage-out=CoverageResult_`basename $$asm`.xml CoverageResult_`basename $$asm`.mlpd > /dev/null; \
 		done; \
 	fi
 

diff --git a/main/tests/Mono.TextTemplating.Tests.dll.filter b/main/tests/Mono.TextTemplating.Tests.dll.filter
@@ -0,0 +1,2 @@
++Mono.TextTemplating
+-Mono.TextTemplating.Tests
diff --git a/main/tests/MonoDevelop.AspNet.Tests.dll.filter b/main/tests/MonoDevelop.AspNet.Tests.dll.filter
@@ -0,0 +1,2 @@
++MonoDevelop.AspNet
+-MonoDevelop.AspNet.Tests
diff --git a/main/tests/MonoDevelop.Debugger.Tests.dll.filter b/main/tests/MonoDevelop.Debugger.Tests.dll.filter
@@ -0,0 +1,5 @@
++Mono.Debugging
++Mono.Debugging.Soft
++MonoDevelop.Debugger
++MonoDevelop.Debugger.Soft
+-MonoDevelop.Debugger.Tests
diff --git a/main/tests/MonoDevelop.PackageManagement.Tests.dll.filter b/main/tests/MonoDevelop.PackageManagement.Tests.dll.filter
@@ -0,0 +1,2 @@
++MonoDevelop.PackageManagement
+-MonoDevelop.PackageManagement.Tests
diff --git a/main/tests/MonoDevelop.TextEditor.Tests.dll.filter b/main/tests/MonoDevelop.TextEditor.Tests.dll.filter
@@ -0,0 +1,2 @@
++Mono.TextEditor
+-Mono.TextEditor.Tests
diff --git a/main/tests/MonoDevelop.VersionControl.Git.Tests.dll.filter b/main/tests/MonoDevelop.VersionControl.Git.Tests.dll.filter
@@ -0,0 +1,6 @@
++MonoDevelop.VersionControl
++MonoDevelop.VersionControl.Git
++MonoDevelop.VersionControl.Subversion
++MonoDevelop.VersionControl.Subversion.Unix
++NGit
+-MonoDevelop.VersionControl.Git.Tests
diff --git a/main/tests/MonoDevelop.Xml.Tests.dll.filter b/main/tests/MonoDevelop.Xml.Tests.dll.filter
@@ -0,0 +1,2 @@
++MonoDevelop.Xml
+-MonoDevelop.Xml.Tests
diff --git a/main/tests/UnitTests.dll.filter b/main/tests/UnitTests.dll.filter
@@ -0,0 +1,10 @@
++MonoDevelop.Core
++MonoDevelop.CSharpBinding
++MonoDevelop.CSharpBinding.Refactoring
++MonoDevelop.Ide.FindInFiles
++MonoDevelop.Ide.Gui
++MonoDevelop.Ide.Templates
++MonoDevelop.Projects
++MonoDevelop.Refactoring
++MonoDevelop.SourceEditor
++MonoDevelop.VersionControl.Views
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		+Mono.TextTemplating
		-Mono.TextTemplating.Tests
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		+MonoDevelop.PackageManagement
		-MonoDevelop.PackageManagement.Tests