From f8ac5bbef56de08051dace78e9334af89de15da0 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 11 Mar 2015 11:45:35 -0700
Subject: Fixes for building tests alone

This change fixes an issue where tests cannot be built alone as well as cleans up the paths.  The general path cleanup was done so that the path format and variable names generally follow the main build of the coreclr repo.  Some highlights are:

 * Don't use Cmake as a directory name for intermediates, use intermediates instead.
 * Disable 4820 warning (this is about padding) when building tests.  Reduces noise in output significantly
 * Some fixes in typos and casing in the project files and build scripts
---
 tests/src/dir.targets | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'tests/src/dir.targets')

diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index a149ad5008..bb050594ac 100644
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -61,10 +61,10 @@
 
   <Target Name="CopyNativeProjectBinaries">
      <ItemGroup>
-        <NativeProjectBinaries Include="$(NativeProjectOutPutFolder)\**\*.*" />
+        <NativeProjectBinaries Include="$(NativeProjectOutputFolder)\**\*.*" />
      </ItemGroup>
 
-     <Error  Text="Then Native Project files are missing in $(NativeProjectOutPutFolder) please run build from the root of the repo at least once"
+     <Error  Text="The native project files are missing in $(NativeProjectOutputFolder) please run build from the root of the repo at least once"
              Condition="'@(NativeProjectBinaries)' == ''" />
 
      <Copy
@@ -93,15 +93,16 @@
           Condition="'@(ProjectReference)' != ''"
           BeforeTargets="Build" >
      <ItemGroup>
-        <NativeProjectOutPutFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__CMakeTestSlnDir)src\))$(Configuration)\"/>
+        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\"/>
      </ItemGroup>
 
-       <Message Text= "Project filese are :$([System.String]::Copy(%(ProjectReference.FileName)).ToUpper()) " />
-       <Message Text= "Project refernce are :%(ProjectReference.Identity)" />
-       <Message Text= "Native Project refernce are :%(NativeProjectReference.Identity)" />
-       <Message Text= "Native Project refernce are :%(NativeProjectReferenceNormalized.Identity)" />
-       <Message Text= "Native Binaries will be copied from :%(NativeProjectOutPutFoldersToCopy.Identity)" />
-   <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutPutFolder=%(NativeProjectOutPutFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != ''" />
+    <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>
 </Project>
+
-- 
cgit v1.2.3