projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6747fa1)
Completelly fix build of tests on Linux
authorRoman Artemev <rartemev@microsoft.com>
Tue, 25 Jul 2017 01:48:03 +0000 (18:48 -0700)
committerRoman Artemev <rartemev@microsoft.com>
Tue, 25 Jul 2017 23:43:35 +0000 (16:43 -0700)
tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj patch | blob | history
tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj patch | blob | history
tests/src/dir.targets patch | blob | history
tests/src/dirs.proj patch | blob | history

diff --git a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj
index 0427657..ad67828 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Always use latest Roslyn compiler -->
-  <Import Project="..\..\..\..\..\..\Tools\net46\roslyn\build\Microsoft.Net.Compilers.props"/>
+  <!-- Always try to use latest Roslyn compiler -->
+  <Import Project="$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props" Condition="Exists('$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
index f3bcfa2..27581ab 100644 (file)
--- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Always use latest Roslyn compiler -->
-  <Import Project="..\..\..\..\..\..\Tools\net46\roslyn\build\Microsoft.Net.Compilers.props"/>
+  <!-- Always try to use latest Roslyn compiler -->
+  <Import Project="$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props" Condition="Exists('$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index 63630e8..4aa925f 100644 (file)
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -50,6 +50,11 @@
     <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Since bug in Roslyn for Linux empty DebugType property leads to build failure. See issue Roslyn@20343 -->
+    <DebugType Condition=" '$(DebugType)' == '' and '$(RunningOnUnix)' == 'true' ">None</DebugType>
+  </PropertyGroup>
+
   <!--
   If it needs ProjectToRun, turn the project into a ProjectReference so it gets built
   -->
diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index 3a5906c..471598d 100644 (file)
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -30,111 +30,6 @@
       <DisabledProjects Include="Performance\performance.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
-      <DisabledProjects Include="JIT\Directed\nullabletypes\**\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Performance\CodeQuality\Span\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <!-- The following project requires System.Reflection.Emit which is not supported on Linux, see issue corefx@4491 -->
-      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67414\b67414.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <!-- The following projects cannot be compiled on Linux due to "csc.exe /debug:+" issue. Remove them after compiler will be fixed -->
-      <DisabledProjects Include="JIT\Directed\Misc\gettype\gettypetypeofmatrix.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\PREFIX\PrimitiveVT\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_d.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_do.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_d.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_do.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv3_il_d.ilproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv3_il_r.ilproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\gettypetypeof\gettypetypeofmatrix.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\int16_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\int16_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\int32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\int32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\int64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\int64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint16_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint16_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint64Opt_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint64Opt_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint8_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Directed\shift\uint8_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Generics\Constraints\Call_instance01_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Generics\Constraints\Call_instance01_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\Boxing\xlang\*.*" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\NaN\arithm32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\NaN\arithm32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\NaN\arithm64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\NaN\arithm64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\cctor\misc\throw_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\cctor\misc\throw_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\eh\**\*.*" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\flowgraph\bug619534\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Methodical\stringintern\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43313\b43313.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51875\b51875.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55197\b55197.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V2.0-RTM\b491215\b491215.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\v2.1\b152292\b152292.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\Dev11\External\Dev11_243742\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_1206929\DevDiv_1206929.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_142976\DevDiv_142976.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_150265\DevDiv_150265.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_168744\DevDiv_168744.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_200492\DevDiv_200492.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278365\DevDiv_278365.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278375\DevDiv_278375.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278376\DevDiv_278376.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278526\DevDiv_278526.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280120\DevDiv_280120.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280123\DevDiv_280123.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280127\DevDiv_280127.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_283795\DevDiv_283795.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_284785\DevDiv_284785.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_288222\DevDiv_288222.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10215\GitHub_10215.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10481\GitHub_10481.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10621\GitHub_10621.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10714\GitHub_10714.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_1296\GitHub_1296.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_1323\GitHub_1323.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_2580\GitHub_2580.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_2610\GitHub_2610.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_3449\GitHub_3449.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_4044\GitHub_4044.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_4115\GitHub_4115.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_5047\GitHub_5047.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_5696\GitHub_5696.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6238\GitHub_6238.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6239\GitHub_6239.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6318\GitHub_6318.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6649\GitHub_6649.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_7508\Vector3Test.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_7906\GitHub_7906.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8220\GitHub_8220.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8460\GitHub_8460.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8599\GitHub_8599.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_9891\GitHub_9891.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10780\GitHub_10780.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10940\GitHub_10940.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11343\GitHub_11343.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11408\GitHub_11408.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11689\GitHub_11689.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11733\GitHub_11733.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11814\GitHub_11814.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\jit64\eh\**\*.*" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\jit64\hfa\main\**\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\opt\virtualstubdispatch\manyintf\*.csproj" Condition="'$(RunningOnCore)' == 'true'" />
-      <DisabledProjects Include="JIT\jit64\opt\cse\hugeexpr1.csproj" Condition="'$(BuildOS)' == 'OSX'" />
-      <DisabledProjects Include="JIT\jit64\opt\cse\HugeField2.csproj" Condition="'$(BuildOS)' == 'OSX'" />
-      <DisabledProjects Include="JIT\jit64\opt\cse\hugeSimpleExpr1.csproj" Condition="'$(BuildOS)' == 'OSX'" />
-      <DisabledProjects Include="Loader\classloader\generics\Instantiation\Nesting\NestedGenericStructs.csproj" Condition="'$(BuildOS)' == 'OSX'" />
     </ItemGroup>
     
     <ItemGroup>
Domain: Dotnet / Core;