Skip to content

Commit e6a15a0

Browse files
authored
Merge remaining JIT tests (#94444)
1 parent b4ba5da commit e6a15a0

File tree

85 files changed

+261
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+261
-99
lines changed

src/tests/JIT/BBT/Scenario4/Not-Int32.ilproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.IL">
22
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
3+
<!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
4+
<RequiresProcessIsolation>true</RequiresProcessIsolation>
45
<CLRTestPriority>1</CLRTestPriority>
56
</PropertyGroup>
67
<PropertyGroup>

src/tests/JIT/CodeGenBringUpTests/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3-
<Import Project="..\..\Directory.Merged.props" />
43
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
54

65
<PropertyGroup>

src/tests/JIT/Directed/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\Directory.Merged.props" />
43
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
54

65
<PropertyGroup>

src/tests/JIT/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project>
2+
<Import Project="..\Directory.Merged.props" />
23
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
34

45
<PropertyGroup>

src/tests/JIT/Generics/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3-
<Import Project="..\..\Directory.Merged.props" />
43
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
54

65
<PropertyGroup>

src/tests/JIT/HardwareIntrinsics/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3-
<Import Project="..\..\Directory.Merged.props" />
43
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
54

65
<ItemGroup>

src/tests/JIT/IL_Conformance/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\Directory.Merged.props" />
43
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
54

65
<PropertyGroup>

src/tests/JIT/Intrinsics/BMI1Intrinsics.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
using System;
22
using System.Runtime.CompilerServices;
3+
using Xunit;
34

45
namespace BMI1Intrinsics
56
{
6-
internal class Program
7+
public class Program
78
{
89
private static int _errorCode = 100;
910

10-
static int Main()
11+
[Fact]
12+
public static int TestEntryPoint()
1113
{
1214
// bmi1 expression are folded to hwintrinsics that return identical results
1315

src/tests/JIT/Intrinsics/BMI1Intrinsics_ro.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
3+
<!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
4+
<RequiresProcessIsolation>true</RequiresProcessIsolation>
45
<DebugType>None</DebugType>
56
<Optimize>True</Optimize>
67
</PropertyGroup>

src/tests/JIT/Intrinsics/BMI1Intrinsicss_r.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
3+
<!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
4+
<RequiresProcessIsolation>true</RequiresProcessIsolation>
45
<DebugType>None</DebugType>
56
<Optimize />
67
</PropertyGroup>

0 commit comments

Comments
 (0)