diff options
| author | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-01-20 20:05:04 -0800 |
|---|---|---|
| committer | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-01-21 13:34:37 -0800 |
| commit | 138cb906f283e0ae4a8b73cfe02c97c5b494b8fa (patch) | |
| tree | 08a25407b92ce2eff608e4192151b93b7c900b29 | |
| parent | 17cf0eae0414c01c33af403cc54bb37cf3b84016 (diff) | |
| download | coreclr-138cb906f283e0ae4a8b73cfe02c97c5b494b8fa.tar.gz coreclr-138cb906f283e0ae4a8b73cfe02c97c5b494b8fa.tar.bz2 coreclr-138cb906f283e0ae4a8b73cfe02c97c5b494b8fa.zip | |
Fixes the test intermediates layout for clean builds
| -rw-r--r-- | tests/buildtest.cmd | 6 | ||||
| -rw-r--r-- | tests/src/dir.common.props | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/buildtest.cmd b/tests/buildtest.cmd index f7a02ec608..96d13371f3 100644 --- a/tests/buildtest.cmd +++ b/tests/buildtest.cmd @@ -87,12 +87,12 @@ if %__verbosity%==detailed ( echo %__MsgPrefix%Commencing CoreCLR repo test build set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__TestBinDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__TestBinDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%\" :: We have different managed and native intermediate dirs because the managed bits will include :: the configuration information deeper in the intermediates path. :: These variables are used by the msbuild project files. -set "__NativeTestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__ManagedTestIntermediatesDir=%__RootBinDir%\tests\obj" +set "__NativeTestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%\Native" +set "__ManagedTestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%\Managed" :: Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash set "__CMakeBinDir=%__TestBinDir%" diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props index a04f439244..40ac649090 100644 --- a/tests/src/dir.common.props +++ b/tests/src/dir.common.props @@ -37,10 +37,10 @@ <PropertyGroup> <BaseOutputPathWithConfig>$(ProjectDir)\..\bin\tests\$(BuildOS).$(Platform).$(Configuration)\</BaseOutputPathWithConfig> <BaseOutputPathWithConfig Condition="'$(__TestBinDir)' != ''">$(__TestBinDir)\</BaseOutputPathWithConfig> - <BinDir>$(BaseOutputPathWithConfig)\..</BinDir> - <BaseIntermediateOutputPath>$(ProjectDir)\..\bin\tests\obj\</BaseIntermediateOutputPath> + <BinDir>$(BaseOutputPathWithConfig)</BinDir> + <BaseIntermediateOutputPath>$(ProjectDir)\..\bin\tests\obj\$(BuildOS).$(Platform).$(Configuration)\Managed</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(__ManagedTestIntermediatesDir)' != ''">$(__ManagedTestIntermediatesDir)\</BaseIntermediateOutputPath> - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\))</__NativeTestIntermediatesDir> + <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\Native\))</__NativeTestIntermediatesDir> <BuildProjectRelativeDir>$(MSBuildProjectName)\</BuildProjectRelativeDir> <BuildProjectRelativeDir Condition="'$(MSBuildProjectDirectory.Contains($(SourceDir)))'">$([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),''))\$(MSBuildProjectName)</BuildProjectRelativeDir> <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)</IntermediateOutputPath> |