Skip to content

Commit f555045

Browse files
author
Fadi Hanna
committed
Fix failing tests on Ubuntu R2R configuration (dotnet#5435)
1 parent af37c3b commit f555045

30 files changed

+2
-955
lines changed

tests/src/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.il

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,7 @@
1515
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
1616
.ver 4:0:0:0
1717
}
18-
.assembly extern Microsoft.VisualBasic
19-
{
20-
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
21-
.ver 10:0:0:0
22-
}
23-
.assembly extern System.Xml.Linq
24-
{
25-
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
26-
.ver 4:0:0:0
27-
}
28-
.assembly extern System
29-
{
30-
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
31-
.ver 4:0:0:0
32-
}
33-
.assembly extern System.Core
34-
{
35-
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
36-
.ver 4:0:0:0
37-
}
38-
.assembly Module1
18+
.assembly dev10_468712
3919
{
4020
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
4121
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
@@ -47,7 +27,7 @@
4727
.hash algorithm 0x00008004
4828
.ver 0:0:0:0
4929
}
50-
.module Module1.exe
30+
.module dev10_468712.exe
5131
// MVID: {A08CCC44-9903-487B-892B-8613075988F7}
5232
.imagebase 0x00400000
5333
.file alignment 0x00000200
@@ -93,7 +73,6 @@
9373

9474
.class private auto ansi sealed ConsoleApplicationVB.Module1 extends [mscorlib]System.Object
9575
{
96-
.custom instance void [Microsoft.VisualBasic]Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute::.ctor() = ( 01 00 00 00 )
9776
.method public static int32 Main() cil managed
9877
{
9978
.entrypoint

tests/src/Loader/classloader/regressions/163172/MethodImplFinal.il

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@
2222
A4 08 4B CE ) // ..K.
2323
.ver 1:2:3400:0
2424
}
25-
.assembly extern Microsoft.VisualC
26-
{
27-
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
28-
.hash = (AA 0A 15 2C F5 4D 7E 6A 96 7E DE 85 1D A6 76 80 // ...,.M~j.~....v.
29-
16 9B C1 DE )
30-
.ver 8:0:1000:0
31-
}
3225
.assembly MethodImplFinal
3326
{
3427
.permissionset reqmin
@@ -97,7 +90,6 @@
9790
.class public auto ansi A
9891
extends [mscorlib]System.Object
9992
{
100-
.custom instance void [Microsoft.VisualC]Microsoft.VisualC.MiscellaneousBitsAttribute::.ctor(int32) = ( 01 00 01 00 00 00 00 00 )
10193
.method public newslot virtual instance void
10294
f() cil managed
10395
{
@@ -121,7 +113,6 @@
121113
.class public auto ansi B
122114
extends A
123115
{
124-
.custom instance void [Microsoft.VisualC]Microsoft.VisualC.MiscellaneousBitsAttribute::.ctor(int32) = ( 01 00 01 00 00 00 00 00 )
125116
.method public newslot virtual final instance void
126117
g() cil managed
127118
{
@@ -146,7 +137,6 @@
146137
.class public auto ansi C
147138
extends B
148139
{
149-
.custom instance void [Microsoft.VisualC]Microsoft.VisualC.MiscellaneousBitsAttribute::.ctor(int32) = ( 01 00 01 00 00 00 00 00 )
150140
.method public virtual instance void f() cil managed
151141
{
152142
// Code size 1 (0x1)
@@ -170,7 +160,6 @@
170160
.class public auto ansi D
171161
extends A
172162
{
173-
.custom instance void [Microsoft.VisualC]Microsoft.VisualC.MiscellaneousBitsAttribute::.ctor(int32) = ( 01 00 01 00 00 00 00 00 )
174163
.method public virtual instance void f() cil managed
175164
{
176165
// Code size 1 (0x1)
@@ -193,8 +182,6 @@
193182

194183
// =============================================================
195184

196-
.custom ([mscorlib]System.Runtime.CompilerServices.AssemblyAttributesGoHereSM) instance void [mscorlib]System.Security.Permissions.SecurityPermissionAttribute::.ctor(valuetype [mscorlib]System.Security.Permissions.SecurityAction) = ( 01 00 08 00 00 00 01 00 54 02 10 53 6B 69 70 56 // ........T..SkipV
197-
65 72 69 66 69 63 61 74 69 6F 6E 01 ) // erification.
198185
.data D_00008030 = bytearray (
199186
01 00 00 06)
200187
//*********** DISASSEMBLY COMPLETE ***********************

tests/src/Loader/classloader/rmv/il/RMV-4-1-6a.il

Lines changed: 0 additions & 22 deletions
This file was deleted.

tests/src/Loader/classloader/rmv/il/RMV-4-1-6a.ilproj

Lines changed: 0 additions & 38 deletions
This file was deleted.

tests/src/Loader/classloader/rmv/il/RMV-4-1-6b.il

Lines changed: 0 additions & 23 deletions
This file was deleted.

tests/src/Loader/classloader/rmv/il/RMV-4-1-6b.ilproj

Lines changed: 0 additions & 38 deletions
This file was deleted.

tests/src/Loader/classloader/rmv/il/RMV-4-1-6d-two.il

Lines changed: 0 additions & 24 deletions
This file was deleted.

tests/src/Loader/classloader/rmv/il/RMV-4-1-6d-two.ilproj

Lines changed: 0 additions & 38 deletions
This file was deleted.

tests/src/Loader/classloader/rmv/il/RMV-4-1-6d.il

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/src/Loader/classloader/rmv/il/RMV-4-1-6d.ilproj

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)