diff options
| author | William Godbe <william.godbe@comcast.net> | 2016-03-02 12:04:46 -0800 |
|---|---|---|
| committer | William Godbe <william.godbe@comcast.net> | 2016-03-07 11:24:27 -0800 |
| commit | e3efd7412257a9bcf76c7029065606ba97a3fcb1 (patch) | |
| tree | 102b2559e39f49cbcd5e581873aaee81b8c21276 /tests/src/dir.targets | |
| parent | e454121ee731e35de9244596c4a5cd1563d455fe (diff) | |
| download | coreclr-e3efd7412257a9bcf76c7029065606ba97a3fcb1.tar.gz coreclr-e3efd7412257a9bcf76c7029065606ba97a3fcb1.tar.bz2 coreclr-e3efd7412257a9bcf76c7029065606ba97a3fcb1.zip | |
Fix race condition in Pri 2 tests, and revert those tests to Pri 1
Diffstat (limited to 'tests/src/dir.targets')
| -rw-r--r-- | tests/src/dir.targets | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index b578a87d40..1903630c13 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -62,17 +62,16 @@ <Target Name="CoreCompile" /> <!-- If we are a run-only, that depends on another project, this is the "Build" we use. I.e. build all dependency projects, absolutely. - OR, in rare conditions (i.e. non-existant ones so far) a run-only script might be something we depend on, and so we may be asked to - build a run only for a higher priority testcase. --> - <Target Name="Build" Condition="('$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)') Or ('$(_CLRTestInServiceOfHigherPriority)')"> - <MSBuild Projects="@(ProjectReference)" Properties="_CLRTestInServiceOfHigherPriority=true"/> + + <Target Name="Build" Condition="('$(CLRTestKind)'=='RunOnly') And ('$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)')"> + <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="(Exists('$(ToolsDir)Build.Common.targets') And $(_CLRTestCompilesSource) And '$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)') Or ('$(_CLRTestInServiceOfHigherPriority)')" /> + <Import Project="$(ToolsDir)Build.Common.targets" Condition="('$(CLRTestKind)'!='RunOnly') And (Exists('$(ToolsDir)Build.Common.targets') And $(_CLRTestCompilesSource) And '$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)')" /> <Import Project="..\override.targets" Condition="Exists('..\override.targets')"/> @@ -97,7 +96,7 @@ <Import Project="CLRTest.Execute.targets" /> <Target Name="CreateExecuteScript" AfterTargets="Build" - Condition="'$(GenerateRunScript)' != 'false' And (('$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)') Or '$(_CLRTestInServiceOfHigherPriority)')" + Condition="'$(GenerateRunScript)' != 'false' And ('$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)')" DependsOnTargets="GenerateExecutionScriptsInternal" /> <PropertyGroup> @@ -160,4 +159,3 @@ </Target> </Project> - |