summaryrefslogtreecommitdiff
path: root/tests/src/JIT/Regression/Dev14
diff options
context:
space:
mode:
authorMatt Ellis <matell@microsoft.com>2015-06-30 14:11:27 -0700
committerMatt Ellis <matell@microsoft.com>2015-06-30 14:11:27 -0700
commit3783d7e53f1e7382a0d5d33f739ca687f9136196 (patch)
treead1aca129cb5eef9e97c4e007289dbbd39bde53e /tests/src/JIT/Regression/Dev14
parent3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3 (diff)
downloadcoreclr-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/Dev14')
-rw-r--r--tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj7
-rw-r--r--tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj7
-rw-r--r--tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj7
-rw-r--r--tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj7
-rw-r--r--tests/src/JIT/Regression/Dev14/DevDiv_876169/packages.config8
5 files changed, 20 insertions, 16 deletions
diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
index 136f1be364..ad64fd59df 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
@@ -34,13 +34,16 @@
<Compile Include="DevDiv_876169.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/Dev14/DevDiv_876169/DevDiv_876169_do.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
index f2ec0be31b..d0637dc3f8 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
@@ -34,13 +34,16 @@
<Compile Include="DevDiv_876169.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/Dev14/DevDiv_876169/DevDiv_876169_r.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
index 136f1be364..ad64fd59df 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
@@ -34,13 +34,16 @@
<Compile Include="DevDiv_876169.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/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
index f2ec0be31b..d0637dc3f8 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
@@ -34,13 +34,16 @@
<Compile Include="DevDiv_876169.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/Dev14/DevDiv_876169/packages.config b/tests/src/JIT/Regression/Dev14/DevDiv_876169/packages.config
deleted file mode 100644
index 8f8ccd47d6..0000000000
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/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>