diff options
| author | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2015-10-23 14:39:25 -0700 |
|---|---|---|
| committer | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2015-10-23 17:23:16 -0700 |
| commit | f0e0ebc0624e690dcebd0f3d31b36daf7750c295 (patch) | |
| tree | 2f1f52bce0b95f0b08d06a2f93bba9d8a94b5b94 /tests/src/dir.targets | |
| parent | 68764ae2b70a1d84d05d7bcfd4a9296161e6627a (diff) | |
| download | coreclr-f0e0ebc0624e690dcebd0f3d31b36daf7750c295.tar.gz coreclr-f0e0ebc0624e690dcebd0f3d31b36daf7750c295.tar.bz2 coreclr-f0e0ebc0624e690dcebd0f3d31b36daf7750c295.zip | |
Test Cleanup:
1. Ensures each test has its own unique directory
2. Use Project Reference to refer native CMakeLists.txt
3. Avoids copying the facades to the test build
Diffstat (limited to 'tests/src/dir.targets')
| -rw-r--r-- | tests/src/dir.targets | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 8579131257..20ce3fe066 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -134,19 +134,29 @@ </Target> <Target Name="ConsolidateNativeProjectReference" - Condition="'@(ProjectReference)' != ''" + Condition="'@(NativeProjectReferenceNormalized)' != ''" BeforeTargets="Build" > <ItemGroup> <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\"/> </ItemGroup> - <Message Text= "Project files are :$([System.String]::Copy(%(ProjectReference.FileName)).ToUpper()) " /> - <Message Text= "Project references are :%(ProjectReference.Identity)" /> - <Message Text= "Native project references are :%(NativeProjectReference.Identity)" /> <Message Text= "Full native project references are :%(NativeProjectReferenceNormalized.Identity)" /> <Message Text= "Native binaries will be copied from :%(NativeProjectOutputFoldersToCopy.Identity)" /> <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != ''" /> </Target> + + <PropertyGroup> + <PrepareForRunDependsOn>$(PrepareForRunDependsOn);ResetReferenceCopyLocalPaths</PrepareForRunDependsOn> + </PropertyGroup> + + <Target Name="ResetReferenceCopyLocalPaths" + Condition="'@(ReferenceCopyLocalPaths)' != ''" + BeforeTargets="_CopyFilesMarkedCopyLocal"> + <ItemGroup> + <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.CopyLocal)' != 'true'"/> + </ItemGroup> + </Target> + </Project> |