diff options
| author | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-03-10 15:45:22 -0800 |
|---|---|---|
| committer | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-03-10 18:15:03 -0800 |
| commit | 3ae10f3449a203e3dbb94cff4bf3044314340cc9 (patch) | |
| tree | 7191a1d5321c20c41a6d5ef032c179c125801402 /tests/src/dir.targets | |
| parent | e483278934c3140092a4b6913fe5d7c88d5d943e (diff) | |
| download | coreclr-3ae10f3449a203e3dbb94cff4bf3044314340cc9.tar.gz coreclr-3ae10f3449a203e3dbb94cff4bf3044314340cc9.tar.bz2 coreclr-3ae10f3449a203e3dbb94cff4bf3044314340cc9.zip | |
Enabling standalone builds for Test Project of any Priority
Diffstat (limited to 'tests/src/dir.targets')
| -rw-r--r-- | tests/src/dir.targets | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index a792d14768..8faec24672 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -64,14 +64,21 @@ <!-- If we are a run-only, that depends on another project, this is the "Build" we use. I.e. build all dependency projects, absolutely. --> - <Target Name="Build" Condition="('$(CLRTestKind)'=='RunOnly') And ('$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)')"> + <PropertyGroup> + <BuildAllProjects Condition=" '$(BuildAllProjects)' == ''">false</BuildAllProjects> + <_WillCLRTestProjectBuild Condition="'$(_WillCLRTestProjectBuild)' == ''">false</_WillCLRTestProjectBuild> + <_WillCLRTestProjectBuild Condition="'$(BuildAllProjects)' != true">true</_WillCLRTestProjectBuild> + <_WillCLRTestProjectBuild Condition="'$(DisableProjectBuild)' != true And '$(BuildAllProjects)' == true And '$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)'">true</_WillCLRTestProjectBuild> + </PropertyGroup> + + <Target Name="Build" Condition="('$(CLRTestKind)'=='RunOnly') And '$(_WillCLRTestProjectBuild)'"> <MSBuild Projects="@(ProjectReference)" /> <MakeDir Condition="'$(CLRTestKind)' == 'RunOnly'" ContinueOnError="false" Directories="$(OutputPath)" /> </Target> <!-- We will use an imported build here in the instance that we have source that we need to build, and we are the correct priority...OR if we are being asked to build for a test with a higher priority. --> - <Import Project="$(ToolsDir)Build.Common.targets" Condition="('$(CLRTestKind)'!='RunOnly') And (Exists('$(ToolsDir)Build.Common.targets') And $(_CLRTestCompilesSource) And '$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)')" /> + <Import Project="$(ToolsDir)Build.Common.targets" Condition="('$(CLRTestKind)'!='RunOnly') And $(_CLRTestCompilesSource) And ('$(_WillCLRTestProjectBuild)')"/> <Import Project="..\override.targets" Condition="Exists('..\override.targets')"/> @@ -96,7 +103,7 @@ <Import Project="CLRTest.Execute.targets" /> <Target Name="CreateExecuteScript" AfterTargets="Build" - Condition="'$(GenerateRunScript)' != 'false' And ('$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)')" + Condition="'$(GenerateRunScript)' != 'false' And ('$(_WillCLRTestProjectBuild)')" DependsOnTargets="GenerateExecutionScriptsInternal" /> <PropertyGroup> |