summaryrefslogtreecommitdiff
path: root/tests/tests.targets
diff options
context:
space:
mode:
authorMatt Mitchell <mmitche@microsoft.com>2015-02-12 13:49:53 -0800
committerMatt Mitchell <mmitche@microsoft.com>2015-02-12 15:57:46 -0800
commit73cbb4f49bb22f01b405fe600f331c91d583f876 (patch)
treefaf138e39269aa83fbec80113592924e883ce380 /tests/tests.targets
parent8c6dd79fb18a803b96ebef9bd3ea263907886b4b (diff)
downloadcoreclr-73cbb4f49bb22f01b405fe600f331c91d583f876.tar.gz
coreclr-73cbb4f49bb22f01b405fe600f331c91d583f876.tar.bz2
coreclr-73cbb4f49bb22f01b405fe600f331c91d583f876.zip
Spit out Xunit xml result files
Spit out the xunit result files, as well as make the directory for the xunit html result files consistent with the result of the logs. We should also be passing the include and exclude attributes to the xunit task
Diffstat (limited to 'tests/tests.targets')
-rw-r--r--tests/tests.targets23
1 files changed, 9 insertions, 14 deletions
diff --git a/tests/tests.targets b/tests/tests.targets
index 0923029637..7fd0696602 100644
--- a/tests/tests.targets
+++ b/tests/tests.targets
@@ -10,6 +10,7 @@
<PropertyGroup>
<TestAssemblyDir Condition="'$(TestAssemblyDir)' == ''">$(BaseOutputPathWithConfig)\tests\XunitRunner\</TestAssemblyDir>
<__TestRunHtmlLog Condition="'$(__TestRunHtmlLog)' == ''">$(__LogsDir)\TestRun.html</__TestRunHtmlLog>
+ <__TestRunXmlLog Condition="'$(__TestRunXmlLog)' == ''">$(__LogsDir)\TestRun.xml</__TestRunXmlLog>
</PropertyGroup>
<Target Name="FindTestDirectories">
<ItemGroup>
@@ -46,21 +47,15 @@
<IncludeTraitsItems Include="$(IncludeTraits)" />
<ExcludeTraitsItems Include="$(ExcludeTraits)" />
</ItemGroup>
-
- <PropertyGroup>
- <XunitOptions Condition="'@(IncludeTraitsItems)'!=''">$(XunitOptions)-trait @(IncludeTraitsItems, ' -trait ') </XunitOptions>
- <XunitOptions Condition="'@(ExcludeTraitsItems)'!=''">$(XunitOptions)-notrait @(ExcludeTraitsItems, ' -notrait ') </XunitOptions>
- <XunitOptions >$(XunitOptions) -parallel all </XunitOptions>
- <ParallelizeAssemblies>True</ParallelizeAssemblies>
- <ParallelizeTestCollections>True</ParallelizeTestCollections>
- </PropertyGroup>
- <xunit Assemblies="@(TestAssemblies)"
- WorkingFolder ="$(ThisTestWorkingDir)"
- ParallelizeAssemblies="True"
- ParallelizeTestCollections="True"
- Html="$(__TestRunHtmlLog)"
- />
+ <xunit Assemblies="@(TestAssemblies)"
+ WorkingFolder="$(ThisTestWorkingDir)"
+ ParallelizeAssemblies="True"
+ ParallelizeTestCollections="True"
+ Html="$(__TestRunHtmlLog)"
+ Xml="$(__TestRunXmlLog)"
+ IncludeTraits="@(IncludeTraitsItems)"
+ ExcludeTraits="@(ExcludeTraitsItems)" />
</Target>