diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-06-30 14:11:27 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-06-30 14:11:27 -0700 |
| commit | 3783d7e53f1e7382a0d5d33f739ca687f9136196 (patch) | |
| tree | ad1aca129cb5eef9e97c4e007289dbbd39bde53e /tests/src/JIT/Regression/Dev11 | |
| parent | 3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3 (diff) | |
| download | coreclr-3783d7e53f1e7382a0d5d33f739ca687f9136196.tar.gz coreclr-3783d7e53f1e7382a0d5d33f739ca687f9136196.tar.bz2 coreclr-3783d7e53f1e7382a0d5d33f739ca687f9136196.zip | |
Speed up package resotre of JIT Test build
We spend a fair amount of time (six wall clock minutes on my machine)
doing package restore for the JIT tests. This is because each project
has its own packages.config file, so during the build we call nuget
restore for each project.
There are only four unique packages.config files for all these tests, so
this change moves them to tests/src/JIT/config and updates the project
files to consume them from there.
This means during the build the `EnsureDependencies` target does not
need to invoke nuget restore as often and the build is much faster as a
result.
Diffstat (limited to 'tests/src/JIT/Regression/Dev11')
23 files changed, 45 insertions, 120 deletions
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj index ac18b97820..ec44d17f64 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj @@ -34,13 +34,16 @@ <Compile Include="Dev11_457559.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_457559/packages.config b/tests/src/JIT/Regression/Dev11/Dev11_457559/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/Dev11_457559/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_468598/packages.config b/tests/src/JIT/Regression/Dev11/Dev11_468598/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Regression/Dev11/Dev11_468598/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj index c71b42d233..d589f08404 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj @@ -34,13 +34,16 @@ <Compile Include="Dev11_5437.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_5437/packages.config b/tests/src/JIT/Regression/Dev11/Dev11_5437/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/Dev11_5437/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj index e251a51cd4..bc57d87966 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj @@ -34,13 +34,16 @@ <Compile Include="Dev11_617302.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_617302/packages.config b/tests/src/JIT/Regression/Dev11/Dev11_617302/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/Dev11_617302/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj index 00a4c5237e..ea0a8c472b 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj @@ -34,13 +34,16 @@ <Compile Include="Dev11_646049.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_646049/packages.config b/tests/src/JIT/Regression/Dev11/Dev11_646049/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/Dev11_646049/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/packages.config b/tests/src/JIT/Regression/Dev11/Dev11_b473131/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj index 82e6cf6034..a1363075cf 100644 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj +++ b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj @@ -34,13 +34,16 @@ <Compile Include="DevDiv2_10623.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/packages.config b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/packages.config b/tests/src/JIT/Regression/Dev11/DevDiv2_11321/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj index 0073b52188..e31c891535 100644 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj +++ b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj @@ -33,13 +33,16 @@ <Compile Include="DevDiv2_8863.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/packages.config b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/packages.config b/tests/src/JIT/Regression/Dev11/External/Dev11_14131/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/packages.config b/tests/src/JIT/Regression/Dev11/External/Dev11_90434/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj index 69e931a8fc..cbd917295c 100644 --- a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj +++ b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj @@ -34,13 +34,16 @@ <Compile Include="loopvt.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/dev10_94677/packages.config b/tests/src/JIT/Regression/Dev11/dev10_94677/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/dev10_94677/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj index d32eef0236..b3fb91d0f9 100644 --- a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj +++ b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj @@ -34,13 +34,16 @@ <Compile Include="dev11_13912.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Regression/Dev11/dev11_13912/packages.config b/tests/src/JIT/Regression/Dev11/dev11_13912/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/dev11_13912/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/dev11_165544/packages.config b/tests/src/JIT/Regression/Dev11/dev11_165544/packages.config deleted file mode 100644 index 8f8ccd47d6..0000000000 --- a/tests/src/JIT/Regression/Dev11/dev11_165544/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> - <package id="System.Threading" version="4.0.0-beta-22412" /> - <package id="System.Threading.Thread" version="4.0.0-beta-22512" /> -</packages> diff --git a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj index e051d3090b..03abb76814 100644 --- a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj +++ b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj @@ -34,13 +34,16 @@ <Compile Include="seqpts.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> |