diff options
| author | Richard L Ford <richford@microsoft.com> | 2015-12-04 14:13:27 -0800 |
|---|---|---|
| committer | Richard L Ford <richford@microsoft.com> | 2015-12-07 13:26:11 -0800 |
| commit | 0e7b85c082d78e7d8ee93cb9f98107c60f5a2279 (patch) | |
| tree | 35cf7f2bf05fa956444af35232f1cdbc2defd784 /tests/runtest.proj | |
| parent | 9803ebe310d251a22499897a71fcda4407a2e468 (diff) | |
| download | coreclr-0e7b85c082d78e7d8ee93cb9f98107c60f5a2279.tar.gz coreclr-0e7b85c082d78e7d8ee93cb9f98107c60f5a2279.tar.bz2 coreclr-0e7b85c082d78e7d8ee93cb9f98107c60f5a2279.zip | |
Add Exclude0 option for runtest.cmd for additive exclusion.
Currently when the Exclude parameter is passed to the coreclr
tests/runtest.cmd, the specified file replaces the default coreclr
exclusion file.
But an independent project, e.g. LLILC, may want to exclude the tests
in the coreclr issues.targets file as well as additional tests. In
that case it would be useful if runtest.cmd supported adding an
additional exclusion file that does not replace the default.
This change makes the new Exclude0 option control the default
exclusion list, so specifying Exclude does not overwrite it.
Closes #2238.
Diffstat (limited to 'tests/runtest.proj')
| -rw-r--r-- | tests/runtest.proj | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index 6354682310..00e7e984fd 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -42,7 +42,12 @@ </Target> + <Import Project="$(__Exclude0)" Condition="'$(__Exclude0)' != '' AND '$(XunitTestBinBase)' != ''" /> <Import Project="$(__Exclude)" Condition="'$(__Exclude)' != '' AND '$(XunitTestBinBase)' != ''" /> + <PropertyGroup> + <HaveExcludes>False</HaveExcludes> + <HaveExcludes Condition="('$(__Exclude0)' != '') Or ('$(__Exclude)' != '')">True</HaveExcludes> + </PropertyGroup> <Target Name="CreateXunitWrapper" DependsOnTargets="CreateXunitFacts"> @@ -191,12 +196,12 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). </PropertyGroup> <ItemGroup> - <CanonicalExcludeList Include="%(ExcludeList.FullPath)" Condition="'$(__Exclude)' != ''"/> + <CanonicalExcludeList Include="%(ExcludeList.FullPath)" Condition="$(HaveExcludes)"/> </ItemGroup> <ItemGroup> <AllCMDsPresent Include="$(_CMDDIR)\**\*.cmd" /> - <AllCMDExcludeFilter Include="@(CanonicalExcludeList)" Condition="'$(__Exclude)' != ''"/> + <AllCMDExcludeFilter Include="@(CanonicalExcludeList)" Condition="$(HaveExcludes)"/> <AllCMDs Include="@(AllCMDsPresent)" Exclude="@(AllCMDExcludeFilter)"/> <AllCommands Include="@(AllCMDs)" > |