diff options
| author | Rahul Kumar <rahku@microsoft.com> | 2016-01-25 14:50:20 -0800 |
|---|---|---|
| committer | Rahul Kumar <rahku@microsoft.com> | 2016-02-22 11:35:37 -0800 |
| commit | a8741647cfa038e67a644237bd0806b78fb77b46 (patch) | |
| tree | e0f3ba04869b08dd01c83bbd822879e28618f859 /tests/tests.targets | |
| parent | 284729c614bd87dc7db2834dbcde909fd4275116 (diff) | |
| download | coreclr-a8741647cfa038e67a644237bd0806b78fb77b46.tar.gz coreclr-a8741647cfa038e67a644237bd0806b78fb77b46.tar.bz2 coreclr-a8741647cfa038e67a644237bd0806b78fb77b46.zip | |
add helix run support to coreclr repo
Diffstat (limited to 'tests/tests.targets')
| -rw-r--r-- | tests/tests.targets | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/tests.targets b/tests/tests.targets index 3b7d78b71f..79b60bd9ce 100644 --- a/tests/tests.targets +++ b/tests/tests.targets @@ -8,26 +8,23 @@ </ItemGroup> <PropertyGroup> - <TestAssemblyDir Condition="'$(TestAssemblyDir)' == ''">$(BaseOutputPathWithConfig)\tests\XunitRunner\</TestAssemblyDir> + <TestAssemblyDir Condition="'$(TestAssemblyDir)' == ''">$(BaseOutputPathWithConfig)\tests\</TestAssemblyDir> <__TestRunHtmlLog Condition="'$(__TestRunHtmlLog)' == ''">$(__LogsDir)\TestRun.html</__TestRunHtmlLog> <__TestRunXmlLog Condition="'$(__TestRunXmlLog)' == ''">$(__LogsDir)\TestRun.xml</__TestRunXmlLog> </PropertyGroup> <Target Name="FindTestDirectories"> <ItemGroup> - <AllTestAssemblies Include="$(TestAssemblyDir)*.XUnitWrapper.dll" /> - <TestAssemblies Include="@(AllTestAssemblies)" Exclude="@(_SkipTestAssemblies -> '$(TestAssemblyDir)%(Identity).XUnitWrapper.dll')" /> + <AllTestAssemblies Include="$(BaseOutputPathWithConfig)\*\*.XUnitWrapper.dll" /> + <TestAssemblies Include="@(AllTestAssemblies)" Exclude="@(_SkipTestAssemblies -> '$(TestAssemblyDir)%(Identity)\%(Identity).XUnitWrapper.dll')" /> </ItemGroup> - <Error Text=" The wrappers must be compiled and placed at $(TestAssemblyDir) before they can be run, Do a clean Test Run" + <Error Text=" The wrappers must be compiled and placed at $(TestAssemblyDir)\*\ before they can be run, Do a clean Test Run" Condition="'@(AllTestAssemblies)' == ''" /> <Message Text= "AllTestAssemblies= @(AllTestAssemblies)"/> <Message Text= "TestAssemblies= @(TestAssemblies)"/> - <Message Text= "_SkipTestAssemblies= @(_SkipTestAssemblies -> '$(TestAssemblyDir)%(Identity).XUnitWrapper.dll')"/> + <Message Text= "_SkipTestAssemblies= @(_SkipTestAssemblies -> '$(TestAssemblyDir)%(Identity)\%(Identity).XUnitWrapper.dll')"/> </Target> - <PropertyGroup> - <ThisTestWorkingDir>$(TestAssemblyDir)\</ThisTestWorkingDir> - </PropertyGroup> <UsingTask AssemblyFile="$(SourceDir)\packages\xunit.runner.msbuild\2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll" @@ -35,8 +32,6 @@ <Target Name="RunTests" DependsOnTargets="FindTestDirectories" - Inputs="@(TestAssemblies)" - Outputs="$(ThisTestWorkingDir)\*.*" Condition="'$(SkipTests)' != 'True'"> @@ -49,7 +44,6 @@ </ItemGroup> <xunit Assemblies="@(TestAssemblies)" - WorkingFolder="$(ThisTestWorkingDir)" ParallelizeAssemblies="True" ParallelizeTestCollections="True" Html="$(__TestRunHtmlLog)" |