diff options
| author | Rama krishnan Raghupathy <ramarag@microsoft.com> | 2016-03-16 19:02:33 -0700 |
|---|---|---|
| committer | Rama krishnan Raghupathy <ramarag@microsoft.com> | 2016-03-16 19:02:33 -0700 |
| commit | b49ce37d1191d8bd9234f9e7573fdc3b02396403 (patch) | |
| tree | b92a16e93726b917b9cfea8ad01be002fc9bcc45 /tests/runtest.proj | |
| parent | 5d1a15ef4aa44778b47142bd1bb0f8f944b52c09 (diff) | |
| parent | ac6f19a146d5bf70f05bfee5a447cca5916c15ad (diff) | |
| download | coreclr-b49ce37d1191d8bd9234f9e7573fdc3b02396403.tar.gz coreclr-b49ce37d1191d8bd9234f9e7573fdc3b02396403.tar.bz2 coreclr-b49ce37d1191d8bd9234f9e7573fdc3b02396403.zip | |
Merge pull request #3740 from ramarag/createlayouts
Creates RunTime Dependency Layout as a seperate step
Diffstat (limited to 'tests/runtest.proj')
| -rw-r--r-- | tests/runtest.proj | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index a37452c9fb..810ad71342 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="src\dir.props" /> - <Import Project="$(ToolsDir)Build.Post.targets" Condition="Exists('$(ToolsDir)Build.Post.targets') AND '$(NoBuild)' != 'true'" /> + <Import Project="$(ToolsDir)Build.Post.targets" Condition="Exists('$(ToolsDir)Build.Post.targets') AND '$(BuildWrappers)' == 'true'" /> <PropertyGroup> <XunitTestBinBase Condition="'$(XunitTestBinBase)'==''" >$(BaseOutputPathWithConfig)</XunitTestBinBase> @@ -403,29 +403,29 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <!-- generate project.json for runtime dependency --> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateTestRuntimeJsonFile" - Condition=" '$(NoBuild)'!='true' " /> + Condition=" '$(BuildWrappers)'=='true' " /> <!-- generate project.lock.json file corresponding to above json file --> <MSBuild Projects="src\Common\test_runtime\test_runtime.csproj" - Condition=" '$(NoBuild)'!='true' " /> + Condition=" '$(BuildWrappers)'=='true' " /> <!-- Default for building --> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateAllWrappers" Properties="_CMDDIR=%(TestDirectories.Identity)" - Condition=" '$(NoBuild)'!='true' " /> + Condition=" '$(BuildWrappers)'=='true' " /> <!-- Execution --> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateTestOverlay" - Condition=" '$(NoRun)'!='true' "/> + Condition=" '$(GeneraRuntimeLayout)'=='true' "/> <MSBuild Projects="$(MSBuildProjectFile)" Targets="RunTests" - Condition=" '$(NoRun)'!='true' "/> + Condition=" '$(RunTests)'=='true' "/> </Target> <Target Name="Clean"> - <RemoveDir Condition=" '$(NoBuild)'!='true'" Directories="$(XunitWrapperGeneratedCSDirBase);$(XunitWrapperOutputIntermediatedDirBase)" ContinueOnError="WarnAndContinue" /> + <RemoveDir Condition=" '$(BuildWrappers)'=='true'" Directories="$(XunitWrapperGeneratedCSDirBase);$(XunitWrapperOutputIntermediatedDirBase)" ContinueOnError="WarnAndContinue" /> </Target> </Project> |