Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert JIT\Regression tests to merged test groups #83895

Merged
merged 33 commits into from
Mar 31, 2023
Merged

Convert JIT\Regression tests to merged test groups #83895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ce6b442
static-none uses args - add comment to RequiresProcessIsolation
markples Feb 3, 2023
638a77f
remove unused arg in Runtime_80731.il
markples Feb 3, 2023
4eb4696
Rewrite 4 IL tests to use newarr instead of args
markples Feb 3, 2023
ec49b49
[cs-main] remove unused args in C# tests
markples Feb 3, 2023
6ac253f
Update 9 tests with Main(args)
markples Dec 21, 2022
16d7c0a
Workaround: add RequiresProcessIsolation to LdfldaHack
markples Jan 9, 2023
8becab5
Move [Fact] to correct location in b12263
markples Jan 9, 2023
a6dcac8
In b06020, wrap $ class so that the C# wrapper can call it
markples Jan 9, 2023
997f40a
[ILTransform -public]
markples Feb 3, 2023
b4ebb25
[ILTransform -sr]
markples Feb 3, 2023
f7327fb
Manually rename b598031/test and test2.
markples Jan 5, 2023
59646e6
[ILTransform -prociso] Rerun for new tests
markples Feb 3, 2023
f720b0a
Wrappers
markples Dec 20, 2022
c086eb2
[ILTransform -ilfact]
markples Feb 8, 2023
97a58dc
Several fixes:
markples Dec 20, 2022
660e2e3
Fix TestSummary.cs to handle invalid XML characters
markples Feb 7, 2023
5f5f99b
Manual fix for reflection on rename in Runtime_64883
markples Feb 7, 2023
d3462a5
[ILTransform -a]
markples Feb 7, 2023
da5c0ed
Revert "Manual fix for reflection on rename in Runtime_64883"
markples Feb 8, 2023
88444fd
Manual fixes
markples Mar 14, 2023
3f795e4
Update test groupings and add extern aliases
markples Mar 14, 2023
c08dbb1
Merge remote-tracking branch 'dotnet/main' into merge6
markples Mar 23, 2023
2a1d7da
Finish merge - incorporate changes to csproj/Dir.B.props - fix xunit.…
markples Mar 24, 2023
6989991
[ILTransform -public]
markples Mar 24, 2023
a5f722d
[ILTransform -prociso]
markples Mar 24, 2023
0631574
[ILTransform -ilfact] (undo GitHub_26491)
markples Mar 24, 2023
b87233b
Fix xUnit1003 in Runtime_83003
markples Mar 29, 2023
b4eeaeb
Merge remote-tracking branch 'dotnet/main' into merge6
markples Mar 29, 2023
6d63789
Update new test Runtime_83941 for merged groups
markples Mar 29, 2023
4dc6ecb
59444 - Changing methods to internal broke reflection calls. Use this
markples Mar 29, 2023
af00b08
Fix TestSummary.cs to handle invalid XML characters
markples Mar 30, 2023
6604ff3
Add RequiresProcessIsolation for existing issues.target entry (AOT co…
markples Mar 30, 2023
fd4456b
undo JIT/opt/And/Regressions/Regression1.csproj (possibly from manual…
markples Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion src/tests/Common/XUnitWrapperLibrary/TestSummary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.IO;
using System.Collections.Generic;
using System.Text;
using System.Xml;
namespace XUnitWrapperLibrary;

public class TestSummary
Expand Down Expand Up @@ -43,7 +44,7 @@ public string ToXmlString()
+ $@" method=""{MethodName}"" time=""{Duration.TotalSeconds:F6}""");

string outputElement = !string.IsNullOrWhiteSpace(Output)
? $"<output><![CDATA[{Output}]]></output>"
? $"<output><![CDATA[{XmlConvert.EncodeName(Output)}]]></output>"
: string.Empty;

if (Exception is not null)
Expand Down
8 changes: 5 additions & 3 deletions src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,25 @@
//

using System;
using Xunit;

public class Bug
{
public void Func(ref String str)
internal void Func(ref String str)
{
Console.WriteLine(str.ToString());
str = "Abc";
}

public void run()
internal void run()
{
String[] str = new String[10];
str[0] = "DEF";
Func(ref str[0]);
}

public static int Main()
[Fact]
public static int TestEntryPoint()
{
(new Bug()).run();
Console.WriteLine("Passed");
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
6 changes: 4 additions & 2 deletions src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Diagnostics;
using Xunit;
namespace SetIPTest
{
public class SetIP
Expand All @@ -13,7 +14,7 @@ public SetIP()
}


public static void F()
internal static void F()
{
String s;
double d;
Expand Down Expand Up @@ -53,7 +54,8 @@ public static void F()
}


public static int Main()
[Fact]
public static int TestEntryPoint()
{
Console.WriteLine("Entering Main of SetIP");

Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup>
<!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
<DebugType>PdbOnly</DebugType>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
.assembly extern System.Console
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
Expand All @@ -11,6 +12,9 @@
.class public ILGEN_0x38e94b27 {

.method public static int32 main() {
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.entrypoint
.maxstack 10

Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
//

using Xunit;
namespace Test
{
using System;
Expand All @@ -13,7 +14,8 @@ public BB Method1(float param2)
return new BB();
}

public static int Main()
[Fact]
public static int TestEntryPoint()
{
new BB().Method1(0.0f);
return 100;
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
//

using Xunit;
namespace Test
{
using System;
Expand All @@ -15,7 +16,8 @@ BB Method3(float param2, ulong[] param3)

static bool Static1(float[] param1) { return false; }

public static int Main()
[Fact]
public static int TestEntryPoint()
{
try
{
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
// The .NET Foundation licenses this file to you under the MIT license.
//

using Xunit;
namespace JitTest
{
using System;

public class Test
{
public static int Main()
[Fact]
public static int TestEntryPoint()
{
ulong a = 0x0000000000000020;
ulong b = 0xa697fcbfd6d232d1;
Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
// The .NET Foundation licenses this file to you under the MIT license.
//

using Xunit;
namespace Test
{
using System;

public class App
{
public static int Main()
[Fact]
public static int TestEntryPoint()
{
ulong a = 0x00000000005d909c;
ulong b = 0x00004021bfa15862;
Expand Down
3 changes: 0 additions & 3 deletions src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RestorePackages>true</RestorePackages>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using Xunit;

namespace DefaultNamespace
{
Expand Down Expand Up @@ -135,7 +136,8 @@ public class Bug
internal static readonly String[,] strArr = {{"This", " ", "a", " ", "test", " ", "of", " ", "patience", "."},
{"This", " ", "a", " ", "test", " ", "of", " ", "patience", "."}};

public static int Main()
[Fact]
public static int TestEntryPoint()
{
new Bug();
return 100;
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly extern xunit.core {}
.assembly extern legacy library mscorlib {}
.assembly b07847
{
Expand All @@ -17,6 +18,9 @@
.field public static int32 TLSFieldData at FieldData
.method public static int32 main()
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.entrypoint
ldsfld int32 test::TLSFieldData
ldc.i4 51966
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
<!-- Test relies on tls support see #2441 -->
<DisableProjectBuild>true</DisableProjectBuild>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
.assembly extern System.Console
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
Expand All @@ -13,6 +14,9 @@
.class public _simple {

.method public static int32 main() {
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.entrypoint
.maxstack 100

Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
.assembly extern System.Console
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
Expand All @@ -13,6 +14,9 @@
.class public _simple {

.method public static int32 main() {
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.entrypoint
.maxstack 100

Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
.assembly extern System.Console
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
Expand All @@ -13,6 +14,9 @@
.class public _simple {

.method public static int32 main() {
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.entrypoint
.maxstack 100

Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

.assembly extern legacy library mscorlib {}
.assembly extern xunit.core {}
.assembly extern System.Console
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
Expand All @@ -12,6 +13,9 @@
.class public ExceptionTest {

.method public static int32 main(){
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
.entrypoint
L1:
newobj instance void [mscorlib]System.Exception::.ctor() throw
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
Loading