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.

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\Directed tests to merged test groups #83256

Merged
merged 30 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
07c3f14
Remove test straccess4 - identical to straccess3_cs_d
BrianBohe Jan 20, 2023
ba6d22f
Remove duplicate csproj files - identical to versions without _cs in …
BrianBohe Feb 3, 2023
c425491
Manually remove main arg from out_of_range_fp_to_int_conversions.
BrianBohe Jan 20, 2023
8900958
Remove Main from straccess3 (save as comment for local use)
BrianBohe Jan 20, 2023
b7b6d19
Remove switchdefaultonly* Main argument (replace with noinline consta…
BrianBohe Jan 27, 2023
8cabb62
Remove IL namespace/class declarations (in shift/) that break ILTrans…
BrianBohe Jan 27, 2023
1661858
Use $(TestLibraryProjectPath) in 5 ilproj files (helps ILTransform)
BrianBohe Jan 27, 2023
3395e6b
Manually rename ldfldstatic1_il_r
BrianBohe Feb 3, 2023
19f8801
[cs-main] Remove unused Main arg from arglist\vararg.cs
markples Mar 9, 2023
b237f5e
[ILTransform -p] Rename _d/_r ilproj to _il_d/_il_r (but undo debugin…
markples Mar 10, 2023
a836382
[ILTransform -n] 3 iterations - Deduplicate project names
markples Mar 10, 2023
a0ff951
[ILTransform -a] Match .assembly names to project names
markples Mar 10, 2023
549e942
[ILTransform -prociso] Set RequiresProcessIsolation based on other at…
markples Mar 10, 2023
1446025
[ILTransform -collapse-main-sig] Collapse .method Main to one line to…
markples Mar 10, 2023
82dc64b
[ILTransform -public] Make entry points public, add class if entrypoi…
markples Mar 10, 2023
d5c2e9c
Manually remove "public public" from C# (ILTransform failure on multi…
BrianBohe Feb 14, 2023
83fdffc
Manually fix accessibility after exposing main class (other now-publi…
BrianBohe Feb 3, 2023
a8bcd6f
Manually add missing public/class to entry points (missed by ILTransf…
BrianBohe Feb 22, 2023
66e7b7a
[ILTransform -sr] Fix System.Runtime references
markples Mar 10, 2023
965aba4
[ILTransform -ilfact] [Fact], Main->TestEntryPoint, no OutputType==Exe
markples Mar 10, 2023
d3f4e27
Add projects for merged test runners and Directory.Build.props
BrianBohe Feb 10, 2023
5ab6632
Move simple test runner code to __GenerateMainWrapper.Main (avoids co…
BrianBohe Feb 21, 2023
2dc230d
Rename IL classes to avoid keywords
BrianBohe Feb 22, 2023
f8aca8d
Manually update issues.targets (after renaming various projects)
BrianBohe Feb 22, 2023
bef45f9
Manually convert more_tails.cs (and generated IL from it)
BrianBohe Feb 24, 2023
e9f2c99
Manually fix punning.cs (depended on simple wrapper using "class Prog…
BrianBohe Feb 27, 2023
aea9c6d
Merge remote-tracking branch 'dotnet/main' into merge-directed
markples Mar 23, 2023
8f1e73e
Merge remote-tracking branch 'dotnet/main' into merge-directed
markples Mar 23, 2023
d01ee5e
Finish merge - incorporate changes to csproj/Dir.B.props - fix xunit.…
markples Mar 23, 2023
b4b702a
Rename csproj to be shorter/more consistent with upcoming JIT/Regress…
markples Mar 23, 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
  •  
  •  
  •  
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/Arrays/Complex1.csproj
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/Directed/Arrays/Complex2.csproj
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/Directed/Arrays/LoopCloning.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
using System;
using System.Runtime.CompilerServices;
using System.Runtime.Intrinsics;
using Xunit;

public class Program
{
public static unsafe int Main()
[Fact]
public static unsafe int TestEntryPoint()
{
int result = 0;
try {
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/Arrays/LoopCloning.csproj
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/Directed/Arrays/Simple1.csproj
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/Directed/Arrays/Simple2.csproj
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
8 changes: 5 additions & 3 deletions src/tests/JIT/Directed/Arrays/complex1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//

using System;
using Xunit;

// Do a complex 5 dimensional Jagged array.
struct Complex
Expand All @@ -13,10 +14,11 @@ public void mul_em()
c = a * b;
}
};
public
class Complex_Array_Test

public class Complex_Array_Test
{
public static int Main()
[Fact]
public static int TestEntryPoint()
{
Console.WriteLine("Starting...");
int SIZE = 10;
Expand Down
8 changes: 5 additions & 3 deletions src/tests/JIT/Directed/Arrays/complex2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//

using System;
using Xunit;
public struct Yak
{
public Int32 a;
Expand All @@ -16,13 +17,14 @@ public void Do_Something()
}


internal class Complex2_Array_Test
public class Complex2_Array_Test
{
public static void test(Yak[,,,,,,] Odd_Variable)
internal static void test(Yak[,,,,,,] Odd_Variable)
{
Console.Write(Odd_Variable.Length);
}
public static int Main()
[Fact]
public static int TestEntryPoint()
{
Console.WriteLine("Starting...");
int SIZE = 2;
Expand Down
6 changes: 4 additions & 2 deletions src/tests/JIT/Directed/Arrays/nintindexoutofrange.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
//
using System;
using System.Runtime.CompilerServices;
using Xunit;

class NintIndexOutOfRangeTest
public class NintIndexOutOfRangeTest
{
[MethodImpl(MethodImplOptions.NoInlining)]
static void Stelem_Ref(object[] arr, nint i, Object value)
Expand All @@ -20,7 +21,8 @@ static void LdElemA(object[] arr, nint i)
LdElemATestHelper(ref arr[i]);
}

public static unsafe int Main()
[Fact]
public static unsafe int TestEntryPoint()
{
long longIndex = ((long)1) << 32;
nint index = (nint)longIndex;
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/Arrays/nintindexoutofrange.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestPriority>0</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
Expand Down
8 changes: 5 additions & 3 deletions src/tests/JIT/Directed/Arrays/simple1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
//

using System;
public
using Xunit;

// Do a simple 5 dimensional Jagged array.

class Simple_Array_Test
public class Simple_Array_Test
{
public static int Main()
[Fact]
public static int TestEntryPoint()
{
Console.WriteLine("Starting...");
int SIZE = 10;
Expand Down
6 changes: 4 additions & 2 deletions src/tests/JIT/Directed/Arrays/simple2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
//

using System;
using Xunit;

internal class Simple2_Array_Test
public class Simple2_Array_Test
{
public static int Main()
[Fact]
public static int TestEntryPoint()
{
Console.WriteLine("Starting...");
int SIZE = 10;
Expand Down
6 changes: 4 additions & 2 deletions src/tests/JIT/Directed/BitTest/BitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

class Program
public class Program
{
[MethodImpl(MethodImplOptions.NoInlining)]
static bool I1_BT_reg_reg(sbyte x, int y) => (x & (1 << y)) != 0;
Expand Down Expand Up @@ -37,7 +38,8 @@ class Program
[MethodImpl(MethodImplOptions.NoInlining)]
static bool I8_BT_mem_reg(ref long x, int y) => (x & (1L << y)) != 0;

static int Main()
[Fact]
public static int TestEntryPoint()
{
sbyte i1min = sbyte.MinValue;
sbyte i1one = 1;
Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Directed/BitTest/BitTest.csproj
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>(3);
new DerivedClass<int>(8);
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>("NotNull");
new DerivedClass<int>(null);
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>(7);
return 100;
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>(7);
return 100;
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<Reftype>();
new DerivedClass<Valuetype>();
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>(3);
new DerivedClass<int>(8);
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>("NotNull");
new DerivedClass<int>(null);
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>(7);
return 100;
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

using System;
using System.Runtime.CompilerServices;
using Xunit;

namespace Test
{
static class App
public static class App
{
static int Main()
[Fact]
public static int TestEntryPoint()
{
new DerivedClass<int>(7);
return 100;
Expand Down
Loading