diff options
author | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2016-06-02 15:09:28 -0700 |
---|---|---|
committer | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2016-06-02 15:22:21 -0700 |
commit | 86ada24cf6c3b5b32bb325e905a9a9fa69641189 (patch) | |
tree | 74ab2a72a556fc74b58e7bc38058b4d1f51d3803 | |
parent | 465373e31780477054a3d0b013a94acb54ab0b59 (diff) | |
download | coreclr-86ada24cf6c3b5b32bb325e905a9a9fa69641189.tar.gz coreclr-86ada24cf6c3b5b32bb325e905a9a9fa69641189.tar.bz2 coreclr-86ada24cf6c3b5b32bb325e905a9a9fa69641189.zip |
Remove unnecessary dependencies from JIT tests causing R2R failures
b05623 did basically nothing so I deleted it.
I removed a presumably useless VisualBasic attribute and other unnecessary
assembly references from the other two tests.
Fixes #5428
5 files changed, 2 insertions, 270 deletions
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/app.config b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/app.config deleted file mode 100644 index 8077c95440..0000000000 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/app.config +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.20.0" newVersion="4.0.20.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Text.Encoding" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.IO" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.il b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.il deleted file mode 100644 index 7505a649a1..0000000000 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.il +++ /dev/null @@ -1,156 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -.assembly extern mscorlib { } -.assembly extern System.Console -{ - .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) - .ver 4:0:0:0 -} -.assembly extern Microsoft.VisualC -{ - .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .hash = (EC 47 1C 7B E2 10 BB EE 15 E2 3B 4E FB 55 44 9D // .G.{......;N.UD. - E2 D0 4D B7 ) // ..M. - .ver 7:0:3300:0 -} -.assembly t -{ - - // --- The following custom attribute is added automatically, do not uncomment ------- - // .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool, - // bool) = ( 01 00 00 01 00 00 ) - - .hash algorithm 0x00008004 - .ver 0:0:0:0 -} -.module t.exe -// MVID: {B0E04E8C-E35E-406B-87D5-0DB207C0D0AC} -.imagebase 0x00400000 -.subsystem 0x00000003 -.file alignment 512 -.corflags 0x00000001 -// Image base: 0x02fe0000 - -// =============== CLASS MEMBERS DECLARATION =================== - -.method public static char modopt([Microsoft.VisualC]Microsoft.VisualC.IsConstModifier)& modopt([mscorlib]System.Runtime.CompilerServices.CallConvCdecl) - PtrToStringChars(string modopt([Microsoft.VisualC]Microsoft.VisualC.IsConstModifier) s) cil managed -{ - .vtentry 3 : 1 - // Code size 24 (0x18) - .maxstack 2 - .locals (unsigned int8 modopt([Microsoft.VisualC]Microsoft.VisualC.IsConstModifier)& pinned modreq([mscorlib]System.Runtime.CompilerServices.IsVolatile) V_0, - unsigned int32 V_1, - string modopt([Microsoft.VisualC]Microsoft.VisualC.IsConstModifier) pinned modreq([mscorlib]System.Runtime.CompilerServices.IsVolatile) V_2) - IL_0000: ldnull - IL_0001: stloc.2 - IL_0002: ldarg.0 - IL_0003: stloc.2 - IL_0004: ldarg.0 - IL_0005: conv.i4 - IL_0006: stloc.0 - IL_0007: ldloc.0 - IL_0008: brfalse.s IL_0014 - - IL_000a: call int32 [mscorlib]System.Runtime.CompilerServices.RuntimeHelpers::get_OffsetToStringData() - IL_000f: stloc.1 - IL_0010: ldloc.0 - IL_0011: ldloc.1 - IL_0012: add - IL_0013: stloc.0 - IL_0014: ldloc.0 - IL_0015: br.s IL_0017 - - IL_0017: ret -} // end of global method PtrToStringChars - - -.class private auto ansi beforefieldinit T - extends [mscorlib]System.Object -{ - .method public hidebysig static int32 Main(string[] args) cil managed - { - .entrypoint - // Code size 9 (0x9) - .maxstack 1 - ldc.i4 100 - IL_0008: ret - } // end of method T::Main - - - .method family static void StringToPtrFast(string pstrSrc, - int32 offset, - char* pwchDest, - int32 modopt([Microsoft.VisualC]Microsoft.VisualC.IsLongModifier) cwchSize) cil managed - { - // Code size 64 (0x40) - .maxstack 3 - .locals (char modopt([Microsoft.VisualC]Microsoft.VisualC.IsConstModifier)& pinned modreq([mscorlib]System.Runtime.CompilerServices.IsVolatile) V_0, - int32 V_1) - IL_0000: ldc.i4.0 - IL_0001: ldarg.3 - IL_0002: bge.s IL_003f - - IL_0004: ldarg.0 - IL_0005: call instance int32 [mscorlib]System.String::get_Length() - IL_000a: ldarg.1 - IL_000b: ldarg.3 - IL_000c: add - IL_000d: blt.s IL_0039 - - IL_000f: ldarg.0 - IL_0010: call char modopt([Microsoft.VisualC]Microsoft.VisualC.IsConstModifier)& modopt([mscorlib]System.Runtime.CompilerServices.CallConvCdecl) PtrToStringChars(string modopt([Microsoft.VisualC]Microsoft.VisualC.IsConstModifier)) - IL_0015: stloc.0 - IL_0016: ldloc.0 - IL_0017: ldarg.1 - IL_0018: ldc.i4.2 - IL_0019: mul - IL_001a: add - IL_001b: stloc.0 - IL_001c: ldc.i4.0 - IL_001d: stloc.1 - IL_001e: ldloc.1 - IL_001f: ldarg.3 - IL_0020: bge.s IL_0035 - - IL_0022: ldarg.2 - IL_0023: ldloc.0 - IL_0024: ldind.u2 - IL_0025: stind.i2 - IL_0026: ldarg.2 - IL_0027: ldc.i4.2 - IL_0028: add - IL_0029: starg.s pwchDest - IL_002b: ldloc.0 - IL_002c: ldc.i4.2 - IL_002d: add - IL_002e: stloc.0 - IL_002f: ldloc.1 - IL_0030: ldc.i4.1 - IL_0031: add - IL_0032: stloc.1 - IL_0033: br.s IL_001e - - IL_0035: ldc.i4.0 - IL_0036: stloc.0 - IL_0037: br.s IL_003f - - IL_0039: newobj instance void [mscorlib]System.IndexOutOfRangeException::.ctor() - IL_003e: throw - - IL_003f: ret - } // end of method CXVariantBase::StringToPtrFast - - - -} // end of class T - - - -// ============================================================= - - -//*********** DISASSEMBLY COMPLETE *********************** -// WARNING: Created Win32 resource file repro.res diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.ilproj deleted file mode 100644 index 649a5444ab..0000000000 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b05623/b05623.ilproj +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <AssemblyName>$(MSBuildProjectName)</AssemblyName> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <ItemGroup> - <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> - <Visible>False</Visible> - </CodeAnalysisDependentAssemblyPaths> - </ItemGroup> - <PropertyGroup> - - </PropertyGroup> - <ItemGroup> - <Compile Include="b05623.il" /> - </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> - </PropertyGroup> -</Project>
\ No newline at end of file diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il index af0741ebbc..441f3349ab 100644 --- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il +++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il @@ -14,26 +14,6 @@ .assembly extern mscorlib { } -.assembly extern Microsoft.VisualBasic -{ - .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) - .ver 7:0:0:0 -} -.assembly extern System -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 1:0:2411:0 -} -.assembly extern System.Data -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 1:0:2411:0 -} -.assembly extern System.Xml -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 1:0:2411:0 -} .assembly ConsoleApplication2 { @@ -64,7 +44,6 @@ .class private auto ansi sealed Module1 extends [mscorlib]System.Object { - .custom instance void [Microsoft.VisualBasic]Microsoft.VisualBasic.Globals/StandardModuleAttribute::.ctor() = ( 01 00 00 00 ) .method public static int32 Main() cil managed { .entrypoint @@ -93,7 +72,7 @@ IL_0027: nop IL_0028: nop IL_0029: nop - ldc.i4 100 + ldc.i4 100 IL_002a: ret } diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il index fddf6316c8..e4ada33948 100644 --- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il +++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il @@ -14,26 +14,6 @@ .assembly extern mscorlib { } -.assembly extern Microsoft.VisualBasic -{ - .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) - .ver 7:0:0:0 -} -.assembly extern System -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 1:0:2411:0 -} -.assembly extern System.Data -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 1:0:2411:0 -} -.assembly extern System.Xml -{ - .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) - .ver 1:0:2411:0 -} .assembly CByte7a { @@ -64,7 +44,6 @@ .class private auto ansi sealed Module1 extends [mscorlib]System.Object { - .custom instance void [Microsoft.VisualBasic]Microsoft.VisualBasic.Globals/StandardModuleAttribute::.ctor() = ( 01 00 00 00 ) .method public static int32 Main() cil managed { .entrypoint @@ -87,7 +66,7 @@ IL_0012: nop IL_0013: nop IL_0014: ldc.i4 100 - ret + ret } } |