diff --git a/Directory.Build.props b/Directory.Build.props
index 5104b073389d74..ea12ca71919bc1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -93,6 +93,7 @@
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', 'Debug', '$(NetCoreAppToolCurrent)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'TestExclusionListTasks', 'Debug', '$(NetCoreAppToolCurrent)'))
$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'installer.tasks.dll'))
$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetFrameworkToolCurrent)', 'installer.tasks.dll'))
$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.props'))
@@ -104,6 +105,7 @@
$([MSBuild]::NormalizePath('$(WorkloadBuildTasksDir)', 'WorkloadBuildTasks.dll'))
$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))
$([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll'))
+ $([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))
diff --git a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
index 2e883dc9a6c6ef..0868ffb1ac1742 100644
--- a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
@@ -13,7 +13,6 @@ parameters:
runtimeVariant: ''
variables: {}
pool: ''
- runtimeFlavorDisplayName: 'Mono'
dependsOn: []
#arcade-specific parameters
condition: always()
@@ -38,8 +37,8 @@ steps:
osGroup: ${{ parameters.osGroup }}
osSubgroup: ${{ parameters.osSubgroup}}
coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
- runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+ runtimeFlavor: ${{ parameters.runtimeFlavor }}
runtimeVariant: ${{ parameters.runtimeVariant }}
${{ if eq(variables['System.TeamProject'], 'public') }}:
diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
index b1bc6a78bb3fab..d32ca3b66137fe 100644
--- a/eng/pipelines/common/templates/runtimes/build-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -11,7 +11,6 @@ parameters:
variables: {}
pool: ''
runtimeFlavor: 'coreclr'
- runtimeFlavorDisplayName: 'CoreCLR'
runtimeVariant: ''
dependsOn: []
dependOnEvaluatePaths: false
@@ -52,10 +51,10 @@ jobs:
# Compute job name from template parameters
${{ if in(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
name: '${{ parameters.runtimeFlavor }}_common_test_build_p0_AnyOS_AnyCPU_${{ parameters.buildConfig }}'
- displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri0 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
+ displayName: '${{ parameters.runtimeFlavor }} Common Pri0 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
${{ if notIn(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{ parameters.buildConfig }}'
- displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri1 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
+ displayName: '${{ parameters.runtimeFlavor }} Common Pri1 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }}'
# Since the condition is being altered, merge the default with the additional conditions.
# See https://docs.microsoft.com/azure/devops/pipelines/process/conditions
diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index 03288003d85f02..c553827ab39c1b 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -21,7 +21,6 @@ parameters:
variables: {}
pool: ''
runtimeFlavor: 'coreclr'
- runtimeFlavorDisplayName: 'CoreCLR'
shouldContinueOnError: false
dependsOn: []
dependOnEvaluatePaths: false
@@ -81,10 +80,10 @@ jobs:
# Compute job name from template parameters
${{ if in(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
name: 'run_test_p0_${{ parameters.runtimeFlavor }}${{ parameters.runtimeVariant }}_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
- displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeVariant}} Pri0 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
+ displayName: '${{ parameters.runtimeFlavor }} ${{ parameters.runtimeVariant}} Pri0 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
${{ if notIn(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
name: 'run_test_p1_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
- displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeVariant }} Pri1 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
+ displayName: '${{ parameters.runtimeFlavor }} ${{ parameters.runtimeVariant }} Pri1 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
variables:
@@ -335,7 +334,7 @@ jobs:
archType: ${{ parameters.archType }}
osGroup: ${{ parameters.osGroup }}
osSubgroup: ${{ parameters.osSubgroup}}
- runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+ runtimeFlavor: ${{ parameters.runtimeFlavor }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
runtimeVariant: ${{ parameters.runtimeVariant }}
diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
index fe67ff83772244..99a3de5196ac14 100644
--- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
+++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
@@ -24,7 +24,7 @@ parameters:
tieringTest: ''
longRunningGcTests: ''
gcSimulatorTests: ''
- runtimeFlavorDisplayName: 'CoreCLR'
+ runtimeFlavor: 'CoreCLR'
runtimeVariant: ''
shouldContinueOnError: false
@@ -57,7 +57,7 @@ steps:
_PALTestsDir: ${{ parameters.runPALTestsDir }}
_TimeoutPerTestCollectionInMinutes: ${{ parameters.timeoutPerTestCollectionInMinutes }}
_TimeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }}
- runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+ RuntimeFlavor: ${{ parameters.runtimeFlavor }}
_RuntimeVariant: ${{ parameters.runtimeVariant }}
${{ if eq(parameters.publishTestResults, 'true') }}:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
diff --git a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
index 6dd5f6b858b3c7..f1b3bbe955a7c9 100644
--- a/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
+++ b/eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
@@ -18,8 +18,6 @@ parameters:
runtimeVariant: ''
variables: {}
pool: ''
- runtimeFlavor: 'mono'
- runtimeFlavorDisplayName: 'Mono'
dependsOn: []
#arcade-specific parameters
condition: always()
@@ -32,7 +30,7 @@ parameters:
steps:
- - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=monointerpreter /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os Browser wasm $(buildConfigUpper)
+ - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:RuntimeVariant=${{ parameters.runtimeVariant }} /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -mono os Browser wasm $(buildConfigUpper)
displayName: Build Tests
# Send tests to Helix
@@ -44,8 +42,9 @@ steps:
osGroup: ${{ parameters.osGroup }}
osSubgroup: ${{ parameters.osSubgroup}}
coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
- runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+ runtimeFlavor: ${{ parameters.runtimeFlavor }}
+ runtimeVariant: ${{ parameters.runtimeVariant }}
${{ if eq(variables['System.TeamProject'], 'public') }}:
creator: $(Build.DefinitionName)
diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml
index aa7e4257764bde..e6bb45d98887ce 100644
--- a/eng/pipelines/common/templates/wasm-runtime-tests.yml
+++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml
@@ -28,6 +28,7 @@ jobs:
testGroup: innerloop
isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
nameSuffix: AllSubsets_Mono_RuntimeTests
+ runtimeVariant: monointerpreter
buildArgs: -s mono+libs -c $(_BuildConfig)
timeoutInMinutes: 180
condition: >-
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
index 6ea24574d3a768..e6ac905afb0648 100644
--- a/eng/pipelines/common/xplat-setup.yml
+++ b/eng/pipelines/common/xplat-setup.yml
@@ -14,11 +14,6 @@ parameters:
jobs:
- template: ${{ coalesce(parameters.helixQueuesTemplate, parameters.jobTemplate) }}
parameters:
- ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
- runtimeFlavorDisplayName: 'CoreCLR'
- ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- runtimeFlavorDisplayName: 'Mono'
-
shouldContinueOnError: ${{ and(endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest')) }}
# keep in sync with /eng/pipelines/common/variables.yml
diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
index 45ac52c4dcd920..43b78cee145dc9 100644
--- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml
+++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -7,7 +7,6 @@ parameters:
container: ''
pool: ''
platform: ''
- runtimeFlavorDisplayName: ''
shouldContinueOnError: false
dependOnEvaluatePaths: false
jobParameters: {}
@@ -23,8 +22,7 @@ jobs:
pool: ${{ parameters.pool }}
platform: ${{ parameters.platform }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
- dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}}
- runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
+ dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
helixQueues:
# iOS/tvOS simulator x64/x86
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index d67e4cec12332b..ecca458ba59323 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -7,7 +7,6 @@ parameters:
container: ''
pool: ''
platform: ''
- runtimeFlavorDisplayName: ''
shouldContinueOnError: false
dependOnEvaluatePaths: false
jobParameters: {}
@@ -24,7 +23,6 @@ jobs:
platform: ${{ parameters.platform }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}}
- runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
helixQueues:
# Linux arm
diff --git a/src/tasks/AndroidAppBuilder/ApkBuilder.cs b/src/tasks/AndroidAppBuilder/ApkBuilder.cs
index b6acdc48592f1c..2d54e5192f8996 100644
--- a/src/tasks/AndroidAppBuilder/ApkBuilder.cs
+++ b/src/tasks/AndroidAppBuilder/ApkBuilder.cs
@@ -463,7 +463,7 @@ public ApkBuilder(TaskLoggingHelper logger)
// 4. Align APK
string alignedApk = Path.Combine(OutputDir, "bin", $"{ProjectName}.apk");
- Utils.RunProcess(logger, zipalign, $"-v 4 {apkFile} {alignedApk}", workingDir: OutputDir);
+ AlignApk(apkFile, alignedApk, zipalign);
// we don't need the unaligned one any more
File.Delete(apkFile);
@@ -475,6 +475,11 @@ public ApkBuilder(TaskLoggingHelper logger)
return (alignedApk, packageId);
}
+ private void AlignApk(string unalignedApkPath, string apkOutPath, string zipalign)
+ {
+ Utils.RunProcess(logger, zipalign, $"-v 4 {unalignedApkPath} {apkOutPath}", workingDir: OutputDir);
+ }
+
private void SignApk(string apkPath, string apksigner)
{
string defaultKey = Path.Combine(OutputDir, "debug.keystore");
@@ -495,6 +500,31 @@ private void SignApk(string apkPath, string apksigner)
$"--ks-pass pass:android --key-pass pass:android {apkPath}", workingDir: OutputDir);
}
+ public void ZipAndSignApk(string apkPath)
+ {
+ if (string.IsNullOrEmpty(AndroidSdk))
+ AndroidSdk = Environment.GetEnvironmentVariable("ANDROID_SDK_ROOT");
+
+ if (string.IsNullOrEmpty(AndroidSdk) || !Directory.Exists(AndroidSdk))
+ throw new ArgumentException($"Android SDK='{AndroidSdk}' was not found or incorrect (can be set via ANDROID_SDK_ROOT envvar).");
+
+ if (string.IsNullOrEmpty(BuildToolsVersion))
+ BuildToolsVersion = GetLatestBuildTools(AndroidSdk);
+
+ if (string.IsNullOrEmpty(MinApiLevel))
+ MinApiLevel = DefaultMinApiLevel;
+
+ string buildToolsFolder = Path.Combine(AndroidSdk, "build-tools", BuildToolsVersion);
+ string zipalign = Path.Combine(buildToolsFolder, "zipalign");
+ string apksigner = Path.Combine(buildToolsFolder, "apksigner");
+
+ string alignedApkPath = $"{apkPath}.aligned";
+ AlignApk(apkPath, alignedApkPath, zipalign);
+ logger.LogMessage(MessageImportance.High, $"\nMoving '{alignedApkPath}' to '{apkPath}'.\n");
+ File.Move(alignedApkPath, apkPath, overwrite: true);
+ SignApk(apkPath, apksigner);
+ }
+
public void ReplaceFileInApk(string file)
{
if (string.IsNullOrEmpty(AndroidSdk))
diff --git a/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs b/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
new file mode 100644
index 00000000000000..254bef87ef6274
--- /dev/null
+++ b/src/tasks/TestExclusionListTasks/PatchExclusionListInApks.cs
@@ -0,0 +1,56 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+namespace TestExclusionListTasks;
+
+public class PatchExclusionListInApks : Task
+{
+ [Required]
+ public ITaskItem[]? ApkPaths { get; set; }
+
+ [Required]
+ public ITaskItem[]? ExcludedTests { get; set; }
+
+ public string? AndroidSdk { get; set; }
+
+ public string? MinApiLevel { get; set; }
+
+ public string? BuildToolsVersion { get; set; }
+
+ public string? KeyStorePath { get; set; }
+
+ public override bool Execute()
+ {
+ var apkBuilder = new ApkBuilder(Log);
+ apkBuilder.AndroidSdk = AndroidSdk;
+ apkBuilder.MinApiLevel = MinApiLevel;
+ apkBuilder.BuildToolsVersion = BuildToolsVersion;
+ apkBuilder.KeyStorePath = KeyStorePath;
+
+ string testExclusionList = string.Join(
+ '\n',
+ (ExcludedTests ?? Enumerable.Empty()).Select(t => t.ItemSpec));
+ foreach (ITaskItem apk in ApkPaths ?? Enumerable.Empty())
+ {
+ string apkPath = apk.GetMetadata("FullPath")!;
+ apkBuilder.OutputDir = Path.GetDirectoryName(apkPath)!;
+ using (ZipArchive apkArchive = ZipFile.Open(apkPath, ZipArchiveMode.Update))
+ {
+ ZipArchiveEntry assetsZipEntry = apkArchive.GetEntry("assets/assets.zip")!;
+ using ZipArchive assetsArchive = new ZipArchive(assetsZipEntry.Open(), ZipArchiveMode.Update);
+ ZipArchiveEntry testExclusionListEntry = assetsArchive.GetEntry("TestExclusionList.txt")!;
+ using StreamWriter textExclusionListWriter = new StreamWriter(testExclusionListEntry.Open());
+ textExclusionListWriter.WriteLine(testExclusionList);
+ }
+ apkBuilder.ZipAndSignApk(apkPath);
+ }
+ return true;
+ }
+}
diff --git a/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
new file mode 100644
index 00000000000000..d17dc95c41af62
--- /dev/null
+++ b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
@@ -0,0 +1,19 @@
+
+
+ $(TargetFrameworkForNETCoreTasks)
+ Library
+ true
+ false
+ enable
+ $(NoWarn),CA1050
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
index 89fafa77da4331..ad68f35537b92c 100644
--- a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
+++ b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
using System;
@@ -42,6 +42,12 @@ static OutOfProcessTest()
}
}
+ public static bool OutOfProcessTestsSupported =>
+ !OperatingSystem.IsIOS()
+ && !OperatingSystem.IsTvOS()
+ && !OperatingSystem.IsAndroid()
+ && !OperatingSystem.IsBrowser();
+
public static void RunOutOfProcessTest(string basePath, string assemblyPath)
{
int ret = -100;
@@ -65,6 +71,12 @@ public static void RunOutOfProcessTest(string basePath, string assemblyPath)
testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
}
+ if (!File.Exists(testExecutable))
+ {
+ // Skip platform-specific test when running on the excluded platform
+ return;
+ }
+
System.IO.Directory.CreateDirectory(outputDir);
ret = wrapper.RunTest(testExecutable, outputFile, errorFile, Assembly.GetEntryAssembly()!.FullName!, testBinaryBase, outputDir);
diff --git a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
index b1b1f4e44e72ef..daf22773002ef7 100644
--- a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
+++ b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs
@@ -16,6 +16,11 @@ public static async Task RunTests(
string? filter,
HashSet testExclusionList)
{
+ // If an exclusion list is passed as a filter, treat it as though no filter is provided here.
+ if (filter?.StartsWith("--exclusion-list=") == true)
+ {
+ filter = null;
+ }
ApplicationEntryPoint? entryPoint = null;
if (OperatingSystem.IsAndroid())
{
diff --git a/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs b/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
index 6559a6db44f5d5..d0db16db340b53 100644
--- a/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
+++ b/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
@@ -249,7 +249,12 @@ public OutOfProcessTest(string displayName, string relativeAssemblyPath)
Method = displayName;
DisplayNameForFiltering = displayName;
TestNameExpression = $"@\"{displayName}\"";
- ExecutionStatement = $@"TestLibrary.OutOfProcessTest.RunOutOfProcessTest(typeof(Program).Assembly.Location, @""{relativeAssemblyPath}"");";
+ ExecutionStatement = $@"
+if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)
+{{
+TestLibrary.OutOfProcessTest.RunOutOfProcessTest(typeof(Program).Assembly.Location, @""{relativeAssemblyPath}"");
+}}
+";
}
public string TestNameExpression { get; }
diff --git a/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs b/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
index a2cf5f0c70418d..6c4c4f6b57b1b2 100644
--- a/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
+++ b/src/tests/Common/XUnitWrapperLibrary/TestFilter.cs
@@ -5,6 +5,7 @@
using System;
using System.Collections.Generic;
using System.IO;
+using System.Linq;
using System.Text;
namespace XUnitWrapperLibrary;
@@ -47,6 +48,11 @@ public bool IsMatch(string fullyQualifiedName, string displayName, string[] trai
}
return stringToSearch == Filter;
}
+
+ public override string ToString()
+ {
+ return $"{Kind}{(Substring ? "~" : "=")}{Filter}";
+ }
}
public sealed class AndClause : ISearchClause
@@ -61,6 +67,11 @@ public AndClause(ISearchClause left, ISearchClause right)
}
public bool IsMatch(string fullyQualifiedName, string displayName, string[] traits) => _left.IsMatch(fullyQualifiedName, displayName, traits) && _right.IsMatch(fullyQualifiedName, displayName, traits);
+
+ public override string ToString()
+ {
+ return $"({_left}) && ({_right})";
+ }
}
public sealed class OrClause : ISearchClause
@@ -75,6 +86,11 @@ public OrClause(ISearchClause left, ISearchClause right)
}
public bool IsMatch(string fullyQualifiedName, string displayName, string[] traits) => _left.IsMatch(fullyQualifiedName, displayName, traits) || _right.IsMatch(fullyQualifiedName, displayName, traits);
+
+ public override string ToString()
+ {
+ return $"({_left}) || ({_right})";
+ }
}
public sealed class NotClause : ISearchClause
@@ -87,6 +103,11 @@ public NotClause(ISearchClause inner)
}
public bool IsMatch(string fullyQualifiedName, string displayName, string[] traits) => !_inner.IsMatch(fullyQualifiedName, displayName, traits);
+
+ public override string ToString()
+ {
+ return $"!({_inner})";
+ }
}
private readonly ISearchClause? _filter;
@@ -133,6 +154,17 @@ public bool ShouldRunTest(string fullyQualifiedName, string displayName, string[
public static HashSet LoadTestExclusionList()
{
HashSet output = new ();
+
+ // Try reading the exclusion list as a base64-encoded semicolon-delimited string as a commmand-line arg.
+ string[] arguments = Environment.GetCommandLineArgs();
+ string? testExclusionListArg = arguments.FirstOrDefault(arg => arg.StartsWith("--exclusion-list="));
+ if (testExclusionListArg is not null)
+ {
+ string testExclusionListPathFromCommandLine = testExclusionListArg.Substring("--exclusion-list=".Length);
+ output.UnionWith(File.ReadAllLines(testExclusionListPathFromCommandLine));
+ }
+
+ // Try reading the exclusion list as a line-delimited file.
string? testExclusionListPath = Environment.GetEnvironmentVariable("TestExclusionListPath");
if (!string.IsNullOrEmpty(testExclusionListPath))
{
diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index 4bf0fbd0604682..f518dc6dc0ffbc 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -69,7 +69,7 @@
-
+
@@ -324,14 +324,37 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+ <_ExcludeListProject Include="$(RepoRoot)src/tests/issues.targets">
+ XunitTestBinBase=$(TestBinDir);$(_PropertiesToPass)
+
+
+
+
+
+
+
+ DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
<_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)
<_MergedWrapperName>%(_MergedWrapperMarker.FileName)
@@ -343,12 +366,15 @@
+
+ DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
<_MergedWrapperRunScript Include="@(_MergedWrapperMarker->'%(RootDir)%(Directory)AppBundle/RunTests.$(TestScriptExtension)')" />
@@ -367,16 +393,29 @@
MakeRelative function calls Escape function internally that replaces all the Unicode characters with %. -->
$([System.IO.Path]::GetRelativePath('$(_MergedWrapperDirectory)AppBundle', %(FullPath)))
+
+ <_TestExclusionListPlaceholder Include="@(_MergedPayloadFiles)" Condition="$([System.String]::new('%(FileName)').EndsWith('TestExclusionList'))" />
+ <_MergedPayloadFiles Remove="@(_TestExclusionListPlaceholder)" />
+
+
+
+
+
+
+
-
+
+
+
+ DependsOnTargets="DiscoverMergedTestWrappers;GetTestExclusionList">
<_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)
<_MergedWrapperName>%(_MergedWrapperMarker.FileName)
@@ -400,10 +439,16 @@
MakeRelative function calls Escape function internally that replaces all the Unicode characters with %. -->
$([System.IO.Path]::GetRelativePath('$(_MergedWrapperDirectory)AppBundle/$(_MergedWrapperName)/$(Configuration)-$(XCodeSdk)', %(FullPath)))
+
+ <_TestExclusionListPlaceholder Include="@(_MergedPayloadFiles)" Condition="$([System.String]::new('%(FileName)').EndsWith('TestExclusionList'))" />
+ <_MergedPayloadFiles Remove="@(_TestExclusionListPlaceholder)" />
-
+
+
+
@@ -416,7 +461,10 @@
-
+
@@ -428,7 +476,10 @@
-
+
@@ -443,7 +494,7 @@
false
false
false
- $(RuntimeFlavorDisplayName)
+ $(RuntimeFlavor)
R2R
R2R-CG2
$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) @
@@ -542,16 +593,7 @@
-
-
- $(MergedPayloadsRootDirectory)%(FileName)%(Extension)\HelixCommand.txt
- $([System.IO.File]::ReadAllText('%(PayloadHelixCommandFile)'))
- $([System.IO.Path]::GetDirectoryName('%(MergedTestHelixCommand)').Replace('/', '-').Replace('\', '-'))
- $(MergedPayloadsRootDirectory)%(PayloadGroup).zip
-
-
-
-
+
$(MergedPayloadsRootDirectory)%(FileName)%(Extension)\HelixCommand.txt
$([System.IO.File]::ReadAllText('%(PayloadHelixCommandFile)'))
@@ -560,12 +602,6 @@
-
-
- chmod +x %(MergedPayloads.MergedTestHelixCommand)%0A%(MergedPayloads.MergedTestHelixCommand)
-
-
-
%(FileName)%(Extension)
@@ -595,6 +631,7 @@
+ --arg=env:TestExclusionListPath=TestExclusionList.txt
net.dot.%(PayloadGroup)
net.dot.MonoRunner
$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))
@@ -609,6 +646,7 @@
+ --set-env=TestExclusionListPath=TestExclusionList.txt
ios-simulator-64
ios-simulator-64
$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))
diff --git a/src/tests/Common/mergedrunnermobile.targets b/src/tests/Common/mergedrunnermobile.targets
index f595bb35745b11..7371cdc702c5a0 100644
--- a/src/tests/Common/mergedrunnermobile.targets
+++ b/src/tests/Common/mergedrunnermobile.targets
@@ -21,6 +21,24 @@
+
+
+
+ <_PlaceholderExclusionList Include="$(IntermediateOutputPath)/PlaceholderTestExclusionList.txt" />
+
+
+
+
+
diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 96d65ab0eabf50..95e08c3cd3f438 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -217,12 +217,17 @@
+ DependsOnTargets="ResolveCMakeNativeProjectReference;ConsolidateNativeProjectReference"
+ BeforeTargets="Build">
+
+
+
+
-
+
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
index acecaa18c97523..d2bb6937f20b29 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
index 0e8b353b4fede2..a7d552018c1e66 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
@@ -27,12 +27,12 @@
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_i4_huge_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -465,4 +465,4 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_i4_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
index 8bafa72ae50f91..f68f7ae40595a6 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
index 5c244351983fe8..88e02eafd12a6e 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
index 313d277c88bc29..9715a4dbee3be6 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
@@ -19,7 +19,7 @@
{
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_objref_huge_il
{
.class private auto ansi sealed TestClass extends [mscorlib]System.Object
{
@@ -42,10 +42,10 @@
}
} // end of class 'TestClass'
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -53,10 +53,10 @@
)
.entrypoint
.maxstack 70
- .locals (class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
+ .locals (class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
int32 count,
int32[] dim,
- class JitTest.TestClass ref)
+ class JitTest_huge_objref_huge_il.TestClass ref)
ldstr "Creating 32-dimension array"
call void [System.Console]System.Console::WriteLine(string)
@@ -182,7 +182,7 @@
ldloc dim ldc.i4 61 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc dim ldc.i4 63 ldelem.i4
- newobj instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
+ newobj instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -235,7 +235,7 @@
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
- newobj instance void JitTest.TestClass::.ctor()
+ newobj instance void JitTest_huge_objref_huge_il.TestClass::.ctor()
dup
dup
ldc.i4 99
@@ -244,16 +244,16 @@
ldc.i4 98
ldc.r8 8.0
stelem.r8
- stfld float64[] JitTest.TestClass::dbl_ptr
+ stfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 0x05071975
- stfld int32 JitTest.TestClass::magic
+ stfld int32 JitTest_huge_objref_huge_il.TestClass::magic
call void [mscorlib]System.GC::Collect()
dup
stloc ref
- callvirt instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+ callvirt instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -262,7 +262,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
- class JitTest.TestClass)
+ class JitTest_huge_objref_huge_il.TestClass)
ldloc matrix
ldloc dim ldc.i4.0 ldelem.i4
@@ -297,7 +297,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
- callvirt instance class JitTest.TestClass class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+ callvirt instance class JitTest_huge_objref_huge_il.TestClass class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -308,7 +308,7 @@
int32, int32, int32, int32)
dup
- ldfld float64[] JitTest.TestClass::dbl_ptr
+ ldfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -317,7 +317,7 @@
pop
br throw0
next0_0:
- ldfld int32 JitTest.TestClass::magic
+ ldfld int32 JitTest_huge_objref_huge_il.TestClass::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -363,7 +363,7 @@
br cont3
go1:
- call instance class JitTest.TestClass class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+ call instance class JitTest_huge_objref_huge_il.TestClass class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -373,7 +373,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32)
dup
- ldfld float64[] JitTest.TestClass::dbl_ptr
+ ldfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -382,7 +382,7 @@
pop
br throw0
next0_1:
- ldfld int32 JitTest.TestClass::magic
+ ldfld int32 JitTest_huge_objref_huge_il.TestClass::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -431,7 +431,7 @@
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc ref
- call instance void class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+ call instance void class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -440,7 +440,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
- class JitTest.TestClass)
+ class JitTest_huge_objref_huge_il.TestClass)
ldnull
stloc matrix
call void [mscorlib]System.GC::Collect()
@@ -490,7 +490,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
- callvirt instance class JitTest.TestClass& class JitTest.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
+ callvirt instance class JitTest_huge_objref_huge_il.TestClass& class JitTest_huge_objref_huge_il.TestClass[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -501,7 +501,7 @@
int32, int32, int32, int32)
dup
ldind.ref
- ldfld float64[] JitTest.TestClass::dbl_ptr
+ ldfld float64[] JitTest_huge_objref_huge_il.TestClass::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -513,12 +513,12 @@
next0_2:
dup
ldind.ref
- ldfld int32 JitTest.TestClass::magic
+ ldfld int32 JitTest_huge_objref_huge_il.TestClass::magic
ldc.i4 0x05071975
ceq
brfalse pop_and_throw
ldind.ref
- callvirt instance string JitTest.TestClass::ToString()
+ callvirt instance string JitTest_huge_objref_huge_il.TestClass::ToString()
call void [System.Console]System.Console::WriteLine(string)
br pass2
@@ -537,4 +537,4 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_objref_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
index 2f4175fe6d9607..25bbafa9e5668a 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
index 94e605a4c8eff9..66cf95a96a994a 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
index bb92a5c83ce8f6..2c4c00076dbf03 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
@@ -27,12 +27,12 @@
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_r4_huge_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -493,4 +493,4 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_r4_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
index 237b5460e7c877..b6ccf95c650ea4 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
index 02b8518cea66ba..53c12cb9b69533 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
index 1b13ba7598097c..9d1532b447c9ef 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
@@ -27,12 +27,12 @@
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_r8_huge_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -493,4 +493,4 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_r8_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
index aa21ccace97823..523f6fae457bdf 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
index c647fd99504edf..f043a6fa741783 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
index 29863e2435b62d..94b13977aa30c7 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
@@ -27,7 +27,7 @@
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_struct_huge_il
{
.class value private auto ansi sealed TestStruct extends [mscorlib]System.ValueType
{
@@ -37,10 +37,10 @@
.field public unsigned int64[] ul_ptr
} // end of class 'TestStruct'
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -48,11 +48,11 @@
)
.entrypoint
.maxstack 70
- .locals (value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
+ .locals (value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
int32 count,
int32[] dim,
- value class JitTest.TestStruct t,
- value class JitTest.TestStruct r)
+ value class JitTest_huge_struct_huge_il.TestStruct t,
+ value class JitTest_huge_struct_huge_il.TestStruct r)
ldstr "Creating 32-dimension array"
call void [System.Console]System.Console::WriteLine(string)
@@ -178,7 +178,7 @@
ldloc dim ldc.i4 61 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc dim ldc.i4 63 ldelem.i4
- newobj instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
+ newobj instance void value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -232,7 +232,7 @@
ldloc dim ldc.i4 62 ldelem.i4
ldloca t
- initobj JitTest.TestStruct
+ initobj JitTest_huge_struct_huge_il.TestStruct
ldloca t
dup
ldc.i4 99
@@ -241,14 +241,14 @@
ldc.i4 98
ldc.r8 8.0
stelem.r8
- stfld float64[] JitTest.TestStruct::dbl_ptr
+ stfld float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
ldc.i4 0x05071975
- stfld int32 JitTest.TestStruct::magic
+ stfld int32 JitTest_huge_struct_huge_il.TestStruct::magic
call void [mscorlib]System.GC::Collect()
ldloc t
- callvirt instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+ callvirt instance void value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -257,7 +257,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
- value class JitTest.TestStruct)
+ value class JitTest_huge_struct_huge_il.TestStruct)
ldloc matrix
ldloc dim ldc.i4.0 ldelem.i4
@@ -292,7 +292,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
- callvirt instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+ callvirt instance value class JitTest_huge_struct_huge_il.TestStruct value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -305,7 +305,7 @@
stloc r
ldloca r
dup
- ldfld float64[] JitTest.TestStruct::dbl_ptr
+ ldfld float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -314,7 +314,7 @@
pop
br throw0
next0_0:
- ldfld int32 JitTest.TestStruct::magic
+ ldfld int32 JitTest_huge_struct_huge_il.TestStruct::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -360,7 +360,7 @@
br cont3
go1:
- callvirt instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+ callvirt instance value class JitTest_huge_struct_huge_il.TestStruct value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -372,7 +372,7 @@
stloc r
ldloca r
dup
- ldfld float64[] JitTest.TestStruct::dbl_ptr
+ ldfld float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -381,7 +381,7 @@
pop
br throw0
next0_1:
- ldfld int32 JitTest.TestStruct::magic
+ ldfld int32 JitTest_huge_struct_huge_il.TestStruct::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -430,7 +430,7 @@
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc t
- callvirt instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+ callvirt instance void value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -439,7 +439,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
- value class JitTest.TestStruct)
+ value class JitTest_huge_struct_huge_il.TestStruct)
ldnull
stloc matrix
call void [mscorlib]System.GC::Collect()
@@ -489,7 +489,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
- callvirt instance value class JitTest.TestStruct& value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
+ callvirt instance value class JitTest_huge_struct_huge_il.TestStruct& value class JitTest_huge_struct_huge_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -499,7 +499,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32)
dup
- ldfld float64[] JitTest.TestStruct::dbl_ptr
+ ldfld float64[] JitTest_huge_struct_huge_il.TestStruct::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -508,7 +508,7 @@
pop
br throw0
next0_2:
- ldfld int32 JitTest.TestStruct::magic
+ ldfld int32 JitTest_huge_struct_huge_il.TestStruct::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -529,4 +529,4 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_struct_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
index d5d7f813795059..9483d38f9cd49d 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
index bcb4b57f54bdbb..f5b065d62f2d7d 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
index abdf2a1b4760c2..6d9fe67461da60 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
@@ -27,12 +27,12 @@
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_u8_huge_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -469,4 +469,4 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_u8_huge_il'
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
index b5ee3efc0d333c..8c7fc726f20d37 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
index a4bb97162faac4..e9352bee49b968 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/huge_struct.il b/src/tests/JIT/Methodical/Arrays/huge_struct.il
index f774a4efcb79e1..0abc567d58c036 100644
--- a/src/tests/JIT/Methodical/Arrays/huge_struct.il
+++ b/src/tests/JIT/Methodical/Arrays/huge_struct.il
@@ -22,7 +22,7 @@
}
.assembly extern xunit.core {}
// MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
-.namespace JitTest
+.namespace JitTest_huge_struct_Arrays_il
{
.class value private auto ansi sealed TestStruct extends [mscorlib]System.ValueType
{
@@ -32,10 +32,10 @@
.field public unsigned int64[] ul_ptr
} // end of class 'TestStruct'
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -44,11 +44,11 @@
.entrypoint
// Code size 38 (0x26)
.maxstack 70
- .locals init (value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
+ .locals init (value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,] matrix,
int32 count,
int32[] dim,
- value class JitTest.TestStruct t,
- value class JitTest.TestStruct r)
+ value class JitTest_huge_struct_Arrays_il.TestStruct t,
+ value class JitTest_huge_struct_Arrays_il.TestStruct r)
ldc.i4 32
@@ -176,7 +176,7 @@
ldloc dim ldc.i4 61 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc dim ldc.i4 63 ldelem.i4
- newobj instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
+ newobj instance void value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::.ctor(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -233,7 +233,7 @@
ldloc dim ldc.i4 62 ldelem.i4
ldloca t
- initobj JitTest.TestStruct
+ initobj JitTest_huge_struct_Arrays_il.TestStruct
ldloca t
dup
ldc.i4 99
@@ -242,14 +242,14 @@
ldc.i4 98
ldc.r8 8.0
stelem.r8
- stfld float64[] JitTest.TestStruct::dbl_ptr
+ stfld float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
ldc.i4 0x05071975
- stfld int32 JitTest.TestStruct::magic
+ stfld int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
call void [mscorlib]System.GC::Collect()
ldloc t
- callvirt instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+ callvirt instance void value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -258,7 +258,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
- value class JitTest.TestStruct)
+ value class JitTest_huge_struct_Arrays_il.TestStruct)
//---------------------------------------------------------------
// Test typed array's Get method
@@ -296,7 +296,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
- callvirt instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+ callvirt instance value class JitTest_huge_struct_Arrays_il.TestStruct value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -309,7 +309,7 @@
stloc r
ldloca r
dup
- ldfld float64[] JitTest.TestStruct::dbl_ptr
+ ldfld float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -318,7 +318,7 @@
pop
br throw0
next0_0:
- ldfld int32 JitTest.TestStruct::magic
+ ldfld int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -367,7 +367,7 @@
br cont3
go1:
- callvirt instance value class JitTest.TestStruct value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
+ callvirt instance value class JitTest_huge_struct_Arrays_il.TestStruct value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Get(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -379,7 +379,7 @@
stloc r
ldloca r
dup
- ldfld float64[] JitTest.TestStruct::dbl_ptr
+ ldfld float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -388,7 +388,7 @@
pop
br throw0
next0_1:
- ldfld int32 JitTest.TestStruct::magic
+ ldfld int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -440,7 +440,7 @@
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
ldloc t
- callvirt instance void value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
+ callvirt instance void value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Set(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -449,7 +449,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
- value class JitTest.TestStruct)
+ value class JitTest_huge_struct_Arrays_il.TestStruct)
ldnull
stloc matrix
call void [mscorlib]System.GC::Collect()
@@ -500,7 +500,7 @@
ldloc dim ldc.i4 58 ldelem.i4
ldloc dim ldc.i4 60 ldelem.i4
ldloc dim ldc.i4 62 ldelem.i4
- callvirt instance value class JitTest.TestStruct& value class JitTest.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
+ callvirt instance value class JitTest_huge_struct_Arrays_il.TestStruct& value class JitTest_huge_struct_Arrays_il.TestStruct[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]::Address(
int32, int32, int32, int32,
int32, int32, int32, int32,
int32, int32, int32, int32,
@@ -510,7 +510,7 @@
int32, int32, int32, int32,
int32, int32, int32, int32)
dup
- ldfld float64[] JitTest.TestStruct::dbl_ptr
+ ldfld float64[] JitTest_huge_struct_Arrays_il.TestStruct::dbl_ptr
ldc.i4 98
ldelem.r8
ldc.r8 8.0
@@ -519,7 +519,7 @@
pop
br throw0
next0_2:
- ldfld int32 JitTest.TestStruct::magic
+ ldfld int32 JitTest_huge_struct_Arrays_il.TestStruct::magic
ldc.i4 0x05071975
ceq
brfalse throw0
@@ -541,5 +541,5 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_huge_struct_Arrays_il'
//*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj b/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj
index ad153de1e4815a..41a797bc4ff98d 100644
--- a/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/huge_struct.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs
index 05ab3b9a4ef2d1..c61ef112134d5e 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcs_lcs_cs
{
- internal class LCS
+ public class LCS
{
private const int RANK = 4;
@@ -82,7 +83,8 @@ private static void findLCS(int[,,,] c, int[,,,] b, char[][] seq, int[] len)
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs
index 1345b3aac54b52..cfe3cc8e462697 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcs2_lcs_cs
{
- internal class LCS
+ public class LCS
{
private const int RANK = 4;
@@ -82,7 +83,8 @@ private static void findLCS(ref int[][][][] c, ref int[][][][] b, ref char[][] s
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
String[] str = {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj
index f8177935821665..651e6852855d04 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_d.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj
index b862db8362a801..fe62ea39c1b6b5 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_do.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj
index 6b7ddc76b585d7..b14635dffb49ed 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_r.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj
index d48435b7572c1a..90a603bda84af9 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs2_ro.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj
index 5bbd9d21654ea7..1cf5fa05ed4e81 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj
index 63954b94fd25c6..8523d170b69892 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_do.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj
index 08822aaa374d90..421d1332087229 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj
index be881386765990..1658068ca8c253 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_lcs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
index 5c7529de4ea8db..b1094afaccfb01 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
@@ -23,9 +23,9 @@
}
.assembly extern xunit.core {}
// MVID: {52ED7FCA-78F1-42F6-8DE5-7388302AFAA6}
-.namespace JitTest
+.namespace JitTest_lcs_ldlen_lcs_il
{
- .class private auto ansi LCS
+ .class public auto ansi LCS
extends ['mscorlib']System.Object
{
.field private static literal int32 RANK = int32(0x00000004)
@@ -114,7 +114,7 @@
IL_0051: ldarg.0
IL_0052: ldarg.1
IL_0053: ldarg.2
- IL_0054: call class System.String JitTest.LCS::buildLCS(int32[0...,0...,0...,0...],
+ IL_0054: call class System.String JitTest_lcs_ldlen_lcs_il.LCS::buildLCS(int32[0...,0...,0...,0...],
wchar[],
int32[])
IL_0059: ldarg.1
@@ -197,7 +197,7 @@
IL_00b8: ldarg.0
IL_00b9: ldarg.1
IL_00ba: ldarg.2
- IL_00bb: call class System.String JitTest.LCS::buildLCS(int32[0...,0...,0...,0...],
+ IL_00bb: call class System.String JitTest_lcs_ldlen_lcs_il.LCS::buildLCS(int32[0...,0...,0...,0...],
wchar[],
int32[])
IL_00c0: stloc.3
@@ -600,7 +600,7 @@
IL_0194: ret
} // end of method 'LCS::findLCS'
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -710,7 +710,7 @@
IL_0081: ldloc.s V_5
IL_0083: ldloc.2
//IL_0084: ldloc.1
- IL_0085: call void JitTest.LCS::findLCS(int32[0...,0...,0...,0...],
+ IL_0085: call void JitTest_lcs_ldlen_lcs_il.LCS::findLCS(int32[0...,0...,0...,0...],
int32[0...,0...,0...,0...],
wchar[][])
IL_008a: ldc.i4.0
@@ -743,7 +743,7 @@
IL_00b3: ldc.i4.0
IL_00b4: ldelem.ref
IL_00b5: ldloc.1
- IL_00b6: call class System.String JitTest.LCS::buildLCS(int32[0...,0...,0...,0...],
+ IL_00b6: call class System.String JitTest_lcs_ldlen_lcs_il.LCS::buildLCS(int32[0...,0...,0...,0...],
wchar[],
int32[])
IL_00bb: call bool ['mscorlib']System.String::Equals(class System.String,
@@ -778,6 +778,6 @@
} // end of class 'LCS'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_lcs_ldlen_lcs_il'
//*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
index 411ad1841e7a21..384d645d83d952 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
index 19a4fa59d199ac..9db558bf08a2da 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs
index aa4c51b28c6c46..5c2eeb7721367e 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcsbas_lcs_cs
{
- internal class LCS
+ public class LCS
{
private const int RANK = 4;
@@ -106,7 +107,8 @@ private static void findLCS(int[,,,] c, int[,,,] b, char[][] seq, int[] len)
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj
index 92554f1f1070cc..0e9f76de538271 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj
index 00561c71ffd49d..1981cc9bb00dba 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_do.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj
index 14b58bc07892f8..7f9ef6e0aacc7d 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj
index f3efe433108288..3cc2117f7ce6e8 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbas_ro.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs
index b8c21e07f351a3..72807d02ca36ff 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcsbox_lcs_cs
{
- internal class LCS
+ public class LCS
{
private const int RANK = 4;
@@ -82,7 +83,8 @@ private static void findLCS(int[,,,] c, int[,,,] b, char[][] seq, int[] len)
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj
index 9bfd86e0ec3744..97b05853f1d546 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_d.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj
index fcc7f0192bbc1e..adf15757935b00 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_do.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj
index 588c1e65e8831c..a73777348a4123 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_r.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj
index 5a7134ab0a5c6d..8447615d9efad4 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsbox_ro.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs
index 2aa9e9db0af632..875bc8f6eaae30 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcsmax_lcs_cs
{
- internal class LCS
+ public class LCS
{
private const int RANK = 8;
@@ -87,7 +88,8 @@ private static void findLCS(int[,,,,,,,] c, int[,,,,,,,] b, char[][] seq, int[]
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 8 strings\n\n");
String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj
index 460340bda323e5..e6bbe6c02995bc 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj
index a27750d28654cd..0a019dbbc7b99a 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_do.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj
index a99f2e5731fcf1..1e17a021ce43d1 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj
index 111bf6e2c0d674..0e0ceee089fe89 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmax_ro.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs
index c8742adf5279a8..6a90978d9365c0 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcsmixed_lcs_cs
{
- internal class LCS
+ public class LCS
{
private const int RANK = 8;
@@ -87,7 +88,8 @@ private static void findLCS(int[,,,][,,,] c, int[,][,][,][,] b, char[][] seq, in
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 8 strings\n\n");
String[] str = {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj
index da88bbcd34111c..9d0713c333c1bb 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_d.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj
index d720893f3cd0be..d44ee7bc77e64e 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_do.csproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj
index 599921301e8497..d33f975222bd2f 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_r.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj
index a8e456b2ef364e..045eebc682c13f 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsmixed_ro.csproj
@@ -1,6 +1,5 @@
- Exe
None
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs
index 8658356aa36ae8..cebc53e7aacaf8 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval.cs
@@ -2,15 +2,16 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcsval_lcs_cs
{
internal struct Data
{
public int b, c;
};
- internal class LCS
+ public class LCS
{
private const int RANK = 4;
@@ -87,7 +88,8 @@ private static void findLCS(Data[,,,] mtx, char[][] seq, int[] len)
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj
index 65b6c704429680..256916584879d6 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj
index 4964547a242c9a..0860ba2ca12582 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj
index 16b9e015d7a56f..224885505decca 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj
index fc65f9a3e0f0d5..bd95a12e7a8f4d 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsval_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs
index 5b281fa80cb8b5..4653fcc67d29ef 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox.cs
@@ -2,15 +2,16 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace JitTest
+namespace JitTest_lcsvalbox_lcs_cs
{
internal struct Data
{
public int b, c;
};
- internal class LCS
+ public class LCS
{
private const int RANK = 4;
@@ -105,7 +106,8 @@ private static void findLCS(object[,,,] mtx, char[][] seq, int[] len)
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Console.WriteLine("Test searches for longest common subsequence of 4 strings\n\n");
String[] str = new String[RANK] {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj
index 4064bb61053fb1..205e5688fbaee1 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_d.csproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj
index 4a16f2c23b1493..236803fbf1d2a0 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_do.csproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj
index adda62bc6c1deb..54e5605516d5d3 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_r.csproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj
index cfc3527f000d00..485a8317e52900 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcsvalbox_ro.csproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address.il b/src/tests/JIT/Methodical/Arrays/misc/address.il
index 3f8ecc1360d62c..76d4b70de8f2ee 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/address.il
@@ -20,9 +20,9 @@
{
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_address_misc_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
@@ -99,7 +99,7 @@
ret
} // end of method 'Test::try_index'
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -148,43 +148,43 @@
ldloc.0
ldc.i4 -10000
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.m1
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.0
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.1
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 9999
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 10000
ldc.i4.1
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 10006
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldloc.0
@@ -192,7 +192,7 @@
stloc.0
ldc.i4 10005
ldc.i4.1
- call int32 JitTest.Test::try_index(int32[10000...10005], int32, int32)
+ call int32 JitTest_address_misc_il.Test::try_index(int32[10000...10005], int32, int32)
brfalse Failure
ldc.i4 0x64
@@ -218,5 +218,5 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_address_misc_il'
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
index 0c4d8ed5bb2787..ca690302bacbb7 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
index 509fbab284d769..3a4c133b2f425d 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/address_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres.cs b/src/tests/JIT/Methodical/Arrays/misc/arrres.cs
index 28379fca26b02b..907a0bb0e2de84 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres.cs
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace GCTest
+namespace GCTest_arrres_cs
{
- internal class Test
+ public class Test
{
private int _indx;
public bool m_die = false;
@@ -32,7 +33,8 @@ public virtual void CheckValid()
}
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Test1();
Test2();
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres.il b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
index 4374f269a72226..0475dddb3ca8a4 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
@@ -20,14 +20,14 @@
{
}
.assembly extern xunit.core {}
-.namespace GCTest
+.namespace GCTest_arrres_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
.field private int32 m_indx
.field private int32 m_resCount
- .field private static class GCTest.Test[-100...100] arr
+ .field private static class GCTest_arrres_il.Test[-100...100] arr
.method public hidebysig specialname rtspecialname
instance void .ctor(int32 indx) il managed
{
@@ -36,10 +36,10 @@
IL_0001: call instance void [mscorlib]System.Object::.ctor()
IL_0006: ldarg.0
IL_0007: ldarg.1
- IL_0008: stfld int32 GCTest.Test::m_indx
+ IL_0008: stfld int32 GCTest_arrres_il.Test::m_indx
IL_000d: ldarg.0
IL_000e: ldc.i4.0
- IL_000f: stfld int32 GCTest.Test::m_resCount
+ IL_000f: stfld int32 GCTest_arrres_il.Test::m_resCount
IL_0014: ret
} // end of method 'Test::.ctor'
@@ -47,7 +47,7 @@
instance void CheckValid() il managed
{
.maxstack 10
- IL_0000: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0000: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
dup
brinst.s IL_0005
@@ -57,10 +57,10 @@
ret
IL_0005: ldarg.0
- IL_0006: ldfld int32 GCTest.Test::m_indx
+ IL_0006: ldfld int32 GCTest_arrres_il.Test::m_indx
- IL_000b: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_000b: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
IL_000c: ldarg.0
IL_000d: beq.s IL_0015
@@ -77,11 +77,11 @@
.locals (string[] V_0,
int32 V_1)
ldarg.0
- ldfld int32 GCTest.Test::m_indx
+ ldfld int32 GCTest_arrres_il.Test::m_indx
ldc.i4 -10000
beq IL_RET
- IL_0000: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0000: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
dup
brinst.s IL_0005
@@ -91,18 +91,18 @@
ret
IL_0005: ldarg.0
- IL_0006: ldfld int32 GCTest.Test::m_indx
- IL_000b: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_0006: ldfld int32 GCTest_arrres_il.Test::m_indx
+ IL_000b: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
IL_000c: brfalse.s IL_0014
IL_000e: newobj instance void [mscorlib]System.Exception::.ctor()
throw
- IL_0014: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0014: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0019: ldarg.0
- IL_001a: ldfld int32 GCTest.Test::m_indx
+ IL_001a: ldfld int32 GCTest_arrres_il.Test::m_indx
IL_001f: ldarg.0
- IL_0020: callvirt instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+ IL_0020: callvirt instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
IL_0021: ldarg.0
IL_0022: call void [mscorlib]System.GC::ReRegisterForFinalize(class [mscorlib]System.Object)
IL_0027: ldc.i4.5
@@ -115,7 +115,7 @@
IL_0036: ldloc.0
IL_0037: ldc.i4.1
IL_0038: ldarg.0
- IL_0039: ldflda int32 GCTest.Test::m_indx
+ IL_0039: ldflda int32 GCTest_arrres_il.Test::m_indx
IL_003e: call instance string [mscorlib]System.Int32::ToString()
IL_0043: stelem.ref
IL_0044: ldloc.0
@@ -126,12 +126,12 @@
IL_004d: ldc.i4.3
IL_004e: ldarg.0
IL_004f: dup
- IL_0050: ldfld int32 GCTest.Test::m_resCount
+ IL_0050: ldfld int32 GCTest_arrres_il.Test::m_resCount
IL_0055: ldc.i4.1
IL_0056: add
IL_0057: dup
IL_0058: stloc.1
- IL_0059: stfld int32 GCTest.Test::m_resCount
+ IL_0059: stfld int32 GCTest_arrres_il.Test::m_resCount
IL_005e: ldloc.1
IL_005f: stloc.1
IL_0060: ldloca.s V_1
@@ -148,7 +148,7 @@
IL_007b: ret
} // end of method 'Test::Finalize'
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -167,11 +167,11 @@
IL_0002: stloc.0
IL_0003: br.s IL_0017
- IL_0005: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0005: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_000a: ldloc.0
IL_000b: ldloc.0
- IL_000c: newobj instance void GCTest.Test::.ctor(int32)
- IL_0011: callvirt instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+ IL_000c: newobj instance void GCTest_arrres_il.Test::.ctor(int32)
+ IL_0011: callvirt instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
IL_0012: ldloc.0
IL_0013: ldc.i4.s 50
IL_0015: add
@@ -188,23 +188,23 @@
IL_002d: stloc.1
IL_002e: br.s IL_0058
- IL_0030: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0030: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0035: ldloc.1
- IL_0036: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_0036: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
IL_0037: brtrue.s IL_003f
IL_0039: newobj instance void [mscorlib]System.Exception::.ctor()
IL_003e: throw
- IL_003f: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_003f: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0044: ldloc.1
- IL_0045: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
- IL_0046: callvirt instance void GCTest.Test::CheckValid()
- IL_004b: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0045: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+ IL_0046: callvirt instance void GCTest_arrres_il.Test::CheckValid()
+ IL_004b: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0050: ldloc.1
IL_0051: ldnull
- IL_0052: callvirt instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+ IL_0052: callvirt instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
IL_0053: ldloc.1
IL_0054: ldc.i4.s 50
IL_0056: add
@@ -221,22 +221,22 @@
IL_006e: stloc.2
IL_006f: br.s IL_0099
- IL_0071: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0071: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0076: ldloc.2
- IL_0077: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_0077: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
IL_0078: brtrue.s IL_0080
IL_007a: newobj instance void [mscorlib]System.Exception::.ctor()
IL_007f: throw
- IL_0080: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0080: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0085: ldloc.2
- IL_0086: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
- IL_0087: callvirt instance void GCTest.Test::CheckValid()
- IL_008c: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0086: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+ IL_0087: callvirt instance void GCTest_arrres_il.Test::CheckValid()
+ IL_008c: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0091: ldloc.2
IL_0092: ldnull
- IL_0093: callvirt instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+ IL_0093: callvirt instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
IL_0094: ldloc.2
IL_0095: ldc.i4.s 50
IL_0097: add
@@ -252,22 +252,22 @@
IL_00af: stloc.3
IL_00b0: br.s IL_00da
- IL_00b2: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_00b2: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_00b7: ldloc.3
- IL_00b8: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_00b8: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
IL_00b9: brtrue.s IL_00c1
IL_00bb: newobj instance void [mscorlib]System.Exception::.ctor()
IL_00c0: throw
- IL_00c1: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_00c1: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_00c6: ldloc.3
- IL_00c7: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
- IL_00c8: callvirt instance void GCTest.Test::CheckValid()
- IL_00cd: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_00c7: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+ IL_00c8: callvirt instance void GCTest_arrres_il.Test::CheckValid()
+ IL_00cd: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_00d2: ldloc.3
IL_00d3: ldnull
- IL_00d4: callvirt instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+ IL_00d4: callvirt instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
IL_00d5: ldloc.3
IL_00d6: ldc.i4.s 50
IL_00d8: add
@@ -283,22 +283,22 @@
IL_00f0: stloc.s V_4
IL_00f2: br.s IL_0121
- IL_00f4: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_00f4: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_00f9: ldloc.s V_4
- IL_00fb: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_00fb: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
IL_00fc: brtrue.s IL_0104
IL_00fe: newobj instance void [mscorlib]System.Exception::.ctor()
IL_0103: throw
- IL_0104: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0104: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0109: ldloc.s V_4
- IL_010b: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
- IL_010c: callvirt instance void GCTest.Test::CheckValid()
- IL_0111: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_010b: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
+ IL_010c: callvirt instance void GCTest_arrres_il.Test::CheckValid()
+ IL_0111: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0116: ldloc.s V_4
IL_0118: ldnull
- IL_0119: callvirt instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+ IL_0119: callvirt instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
IL_011a: ldloc.s V_4
IL_011c: ldc.i4.s 50
IL_011e: add
@@ -314,9 +314,9 @@
IL_0138: stloc.s V_5
IL_013a: br.s IL_0169
- IL_013c: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_013c: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0141: ldloc.s V_5
- IL_0143: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_0143: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
IL_0144: brtrue.s IL_014c
ldstr "Warning: object at index "
@@ -327,18 +327,18 @@
call void [System.Console]System.Console::WriteLine(string)
br.s IL_0162
- IL_014c: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_014c: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_0151: ldloc.s V_5
- IL_0153: callvirt instance class GCTest.Test class GCTest.Test[-100...100]::Get(int32)
+ IL_0153: callvirt instance class GCTest_arrres_il.Test class GCTest_arrres_il.Test[-100...100]::Get(int32)
dup
- IL_0154: callvirt instance void GCTest.Test::CheckValid()
+ IL_0154: callvirt instance void GCTest_arrres_il.Test::CheckValid()
ldc.i4 -10000
- stfld int32 GCTest.Test::m_indx
+ stfld int32 GCTest_arrres_il.Test::m_indx
- IL_0159: ldsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ IL_0159: ldsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_015e: ldloc.s V_5
IL_0160: ldnull
- IL_0161: callvirt instance void class GCTest.Test[-100...100]::Set(int32, class GCTest.Test)
+ IL_0161: callvirt instance void class GCTest_arrres_il.Test[-100...100]::Set(int32, class GCTest_arrres_il.Test)
IL_0162: ldloc.s V_5
IL_0164: ldc.i4.s 50
@@ -349,7 +349,7 @@
IL_016d: ble.s IL_013c
ldnull
- stsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ stsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_016f: ldstr "Test passed."
IL_0174: call void [System.Console]System.Console::WriteLine(string)
@@ -367,12 +367,12 @@
.maxstack 8
ldc.i4 -100
ldc.i4 201
- newobj instance void class GCTest.Test[-100...100]::.ctor(int32, int32)
- IL_0007: stsfld class GCTest.Test[-100...100] GCTest.Test::arr
+ newobj instance void class GCTest_arrres_il.Test[-100...100]::.ctor(int32, int32)
+ IL_0007: stsfld class GCTest_arrres_il.Test[-100...100] GCTest_arrres_il.Test::arr
IL_000c: ret
} // end of method 'Test::.cctor'
} // end of class 'Test'
-} // end of namespace 'GCTest'
+} // end of namespace 'GCTest_arrres_il'
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj
index 25fa17fe004b56..b31476f1f9edc8 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj
index cf42b4d565e0cf..eb72b061372392 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
index 1020cf984f3b37..a6bfeac6a7b862 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_il_r.ilproj
@@ -1,12 +1,12 @@
- Exe
true
1
PdbOnly
true
+ true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj
index f899f3813137fe..336061e896cbfe 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj b/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj
index 27994eb220754c..250a14512a2666 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs b/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs
index 4724c971d96bed..7a130e78844006 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr.cs
@@ -2,10 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace GCTest
+namespace GCTest_gcarr_cs
{
- internal class Test
+ public class Test
{
private int _magic = 0x12345678;
public virtual void CheckValid()
@@ -14,7 +15,8 @@ public virtual void CheckValid()
throw new Exception();
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Test[] arr = new Test[97];
for (int i = 0; i < 97; i++)
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
index 2341ecc369d3c2..0d983860efffb5 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
@@ -20,9 +20,9 @@
{
}
.assembly extern xunit.core {}
-.namespace GCTest
+.namespace GCTest_gcarr_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
.field private int32 m_magic
@@ -30,7 +30,7 @@
{
.maxstack 8
IL_0000: ldarg.0
- IL_0001: ldfld int32 GCTest.Test::m_magic
+ IL_0001: ldfld int32 GCTest_gcarr_il.Test::m_magic
IL_0006: ldc.i4 0x12345678
IL_000b: beq.s IL_0013
@@ -40,7 +40,7 @@
IL_0013: ret
} // end of method 'Test::CheckValid'
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -48,13 +48,13 @@
)
.entrypoint
.maxstack 3
- .locals (class GCTest.Test[-10...10] V_0,
+ .locals (class GCTest_gcarr_il.Test[-10...10] V_0,
int32 V_1,
int32 V_2,
int32 V_3)
ldc.i4 -10
ldc.i4 21
- newobj instance void class GCTest.Test[-10...10]::.ctor(int32, int32)
+ newobj instance void class GCTest_gcarr_il.Test[-10...10]::.ctor(int32, int32)
IL_0007: stloc.0
IL_0008: ldc.i4 -10
IL_0009: stloc.1
@@ -64,8 +64,8 @@
IL_000d: ldloc.1
dup
call void [System.Console]System.Console::WriteLine(int32)
- IL_000e: newobj instance void GCTest.Test::.ctor()
- callvirt instance void class GCTest.Test[-10...10]::Set(int32, class GCTest.Test)
+ IL_000e: newobj instance void GCTest_gcarr_il.Test::.ctor()
+ callvirt instance void class GCTest_gcarr_il.Test[-10...10]::Set(int32, class GCTest_gcarr_il.Test)
IL_0014: ldloc.1
IL_0015: ldc.i4.1
IL_0016: add
@@ -83,9 +83,9 @@
IL_0030: ldloc.0
IL_0031: ldloc.2
- callvirt instance class GCTest.Test class GCTest.Test[-10...10]::Get(int32)
+ callvirt instance class GCTest_gcarr_il.Test class GCTest_gcarr_il.Test[-10...10]::Get(int32)
- IL_0033: callvirt instance void GCTest.Test::CheckValid()
+ IL_0033: callvirt instance void GCTest_gcarr_il.Test::CheckValid()
IL_0038: ldloc.2
IL_0039: ldc.i4.1
IL_003a: add
@@ -115,7 +115,7 @@
.maxstack 8
IL_0000: ldarg.0
IL_0001: ldc.i4 0x12345678
- IL_0006: stfld int32 GCTest.Test::m_magic
+ IL_0006: stfld int32 GCTest_gcarr_il.Test::m_magic
IL_000b: ldarg.0
IL_000c: call instance void [mscorlib]System.Object::.ctor()
IL_0011: ret
@@ -123,5 +123,5 @@
} // end of class 'Test'
-} // end of namespace 'GCTest'
+} // end of namespace 'GCTest_gcarr_il'
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj
index 8a3e5b12929af3..d76984171f00aa 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj
index 23904d3c5ddaaa..ce031e21e83111 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
index 7d36f5b50c7dfa..494b2846b684a9 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
index 0dda3af06e5fad..0cfe7445a4ceab 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj
index c7d4aa3058a9d4..ffc02501184504 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj b/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj
index 1b5922fe48d3ee..46389d69bf8a63 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
index 82fbad3f6b1000..214517c2982777 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
@@ -18,9 +18,9 @@
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
-.class private auto ansi beforefieldinit InitializeArray extends [mscorlib]System.Object
+.class public auto ansi beforefieldinit InitializeArray extends [mscorlib]System.Object
{
- .method private hidebysig static int32 Main() cil managed
+ .method public hidebysig static int32 Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
index f16a742294e447..d495248f16eda4 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
@@ -96,7 +96,7 @@ class My {
.field public static literal valuetype Color Blue = int32(0x00000002)
} // end of class Color
-.class private auto ansi beforefieldinit My
+.class public auto ansi beforefieldinit My
extends [mscorlib]System.Object
{
.method private hidebysig static valuetype Color[]
@@ -127,7 +127,7 @@ class My {
IL_0011: ret
} // end of method My::WithMinOpts
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
index 82778fa3c95a23..e2f9d6a08e0314 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
index 2a6d91a40f8213..f26b6b3066bc40 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
index dc93ec95205d99..cd43457cf41f16 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
Full
false
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
index 28d452815904a8..573a25a4ab9a38 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
index b43b63976f0719..92e8cb9c0fc448 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
@@ -29,9 +29,9 @@
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_ldelem_get_misc_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
@@ -94,7 +94,7 @@
ret
} // end of method 'Test::try_index'
- .method private hidebysig static int32 Main() il managed
+ .method public hidebysig static int32 Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
@@ -142,49 +142,49 @@
ldloc.0
ldc.i4 -10000
ldc.i4.0
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.m1
ldc.i4.0
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.0
ldc.i4.1
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.1
ldc.i4.1
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 5
ldc.i4.1
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 6
ldc.i4.0
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 10005
ldc.i4.0
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 10006
ldc.i4.0
- call int32 JitTest.Test::try_index(float64[10000...10005], int32, int32)
+ call int32 JitTest_ldelem_get_misc_il.Test::try_index(float64[10000...10005], int32, int32)
brfalse Failure
ldc.i4 0x64
@@ -210,5 +210,5 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_ldelem_get_misc_il'
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
index fe625754b56842..855e4d8f6ec2f3 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
index 8548cbc0d3f57a..3a4dcb67f93132 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0.il b/src/tests/JIT/Methodical/Arrays/misc/length0.il
index 20287f848a20cc..02cc7714ec1759 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0.il
@@ -28,9 +28,9 @@
}
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_length0_misc_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
.method private hidebysig static int32
@@ -92,7 +92,7 @@
ret
} // end of method 'Test::try_index'
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -133,27 +133,27 @@
ldloc.0
ldc.i4 -10000
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.m1
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.0
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.1
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 1000
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldstr "\nCreating zero-length array (newarr instruction)"
@@ -188,27 +188,27 @@
ldloc.0
ldc.i4 -10000
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.m1
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.0
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4.1
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldloc.0
ldc.i4 1000
ldc.i4.0
- call int32 JitTest.Test::try_index(int32[0...], int32, int32)
+ call int32 JitTest_length0_misc_il.Test::try_index(int32[0...], int32, int32)
brfalse Failure
ldc.i4 0x64
@@ -234,5 +234,5 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_length0_misc_il'
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
index 07ff3eb1e1a543..bb52e31721bd69 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
index 56c6934dcebd01..1f851227d37137 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
index 65dbcefeda3640..fde5fe5d56cb73 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
@@ -23,12 +23,12 @@
}
.assembly extern xunit.core {}
// MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
-.namespace JitTest
+.namespace JitTest_lengthm2_misc_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -99,6 +99,6 @@
} // end of class 'Test'
-} // end of namespace 'JitTest'
+} // end of namespace 'JitTest_lengthm2_misc_il'
//*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
index 3ba34a79c5b8c6..4bc51020eb8a07 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
Full
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
index 4fcd5806ad2c5f..b7c2a3a23bbe4a 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
PdbOnly
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref.cs b/src/tests/JIT/Methodical/Arrays/misc/selfref.cs
index 3c2f912f6f408c..3ecdb648e1653b 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref.cs
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref.cs
@@ -2,12 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-namespace GCTest
+namespace GCTest_selfref_cs
{
- internal class Test
+ public class Test
{
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
object aref = null;
object[] arr = new object[16];
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref.il b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
index 32ed4e32937e9e..39c02e0b1433d3 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
@@ -23,12 +23,12 @@
}
.assembly extern xunit.core {}
// MVID: {57800D71-6F51-4ACF-BC86-8F3D2FBAC8E1}
-.namespace GCTest
+.namespace GCTest_selfref_il
{
- .class private auto ansi Test
+ .class public auto ansi Test
extends [mscorlib]System.Object
{
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -141,6 +141,6 @@
} // end of class 'Test'
-} // end of namespace 'GCTest'
+} // end of namespace 'GCTest_selfref_il'
//*********** DISASSEMBLY COMPLETE ***********************
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj
index 5095d6233e68b8..8f69ff79d00c7c 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj
index 013b312ad8f328..f3bc3de00dcf67 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
index 89b3aff4fe7278..f7f419cb49bb00 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
index 5f179d693da007..2abc470fa10a94 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj
index 262a84742c06ad..f7edda42ad5742 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj b/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj
index 3aab23b8de91b6..394cbcfd1a9846 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Arrays/range/Directory.Build.props b/src/tests/JIT/Methodical/Arrays/range/Directory.Build.props
deleted file mode 100644
index 5f8c702b2d6a4f..00000000000000
--- a/src/tests/JIT/Methodical/Arrays/range/Directory.Build.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- false
-
-
-
-
-
- $(MSBuildProjectName.Replace("_il_d", "").Replace("_il_r", ""))
-
-
\ No newline at end of file
diff --git a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
index 11bae844f16e08..bd9c9b20876085 100644
--- a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
+++ b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
@@ -5,7 +5,7 @@
.assembly extern xunit.core {}
.assembly extern mscorlib{auto}
-.class ILGEN_0x1d013582 {
+.class public ILGEN_0x1d013582 {
//BEGIN STATIC FIELDS
.field static int8 field_0x0
@@ -1451,7 +1451,7 @@ End_Orphan_b_106:
ret
}
-.method static int32 Main() {
+.method public static int32 Main() {
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
)
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4.cs b/src/tests/JIT/Methodical/AsgOp/i4/i4.cs
index 6320ad96b6e14d..fb4dda2b81745f 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class test
+namespace Test_i4_cs
+{
+public class test
{
private static int f00(int x, int y)
{
@@ -666,7 +669,8 @@ private static int f109(int x, int y)
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int x;
bool pass = true;
@@ -1560,3 +1564,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
index 68a1d48bc28c40..05c0eee6054e1d 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
index 50a777bd135918..ba70fafb90d05c 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
index c1088014e9b783..010aada021b848 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
index a86937f950005c..70647bb039205f 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs b/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs
index f9d5cda2faa0eb..c1342e077a4e2a 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat.cs
@@ -2,10 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class test
+namespace Test_i4flat_cs
{
- public static int Main()
+public class test
+{
+ [Fact]
+ public static int TestEntryPoint()
{
int x;
int y;
@@ -1121,3 +1125,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
index cfbf4ee7ef1ed1..0fc81d87794e36 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
index 6877e9f6627e68..b84a9fa27477ec 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
index 4ba1a1696a4dc7..ee8dfddaef6a32 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
index 531d01f4f6741d..3d9f0176ec14fd 100644
--- a/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8.cs b/src/tests/JIT/Methodical/AsgOp/i8/i8.cs
index 75caeb8fd93a7f..329bb3784c9c34 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class test
+namespace Test_i8_cs
+{
+public class test
{
private static Int64 f00(Int64 x, Int64 y)
{
@@ -666,7 +669,8 @@ private static Int64 f109(Int64 x, Int64 y)
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Int64 x;
bool pass = true;
@@ -1676,3 +1680,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
index 80569fe3b3a64b..637e3cf56d1b20 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
index 7760c09650f9d5..4a98a6bb5a2e33 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
index b8fd994fe9b827..d9f20b3c02c2df 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
index 3e437a746eccc5..42d221b2eef547 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs b/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs
index 76222aa513f6b8..9c8d0920e3dcb7 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat.cs
@@ -2,10 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class test
+namespace Test_i8flat_cs
{
- public static int Main()
+public class test
+{
+ [Fact]
+ public static int TestEntryPoint()
{
Int64 x;
Int64 y;
@@ -1237,3 +1241,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
index b58c78e9adb433..b87f2512a81220 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
index ffc3f6da89b2e4..1b29e1eb7130cd 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
index dc5d05c7dfa1fa..5dc888527a9325 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
index d0c279241a9256..55ff13fc8d6643 100644
--- a/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4.cs b/src/tests/JIT/Methodical/AsgOp/r4/r4.cs
index d94f838e6e7916..5af3f018592d8b 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4.cs
@@ -3,8 +3,11 @@
using System;
using System.Runtime.CompilerServices;
+using Xunit;
-internal class test
+namespace Test_r4_cs
+{
+public class test
{
[MethodImpl(MethodImplOptions.NoInlining)]
private static float f00(float x, float y)
@@ -182,7 +185,8 @@ private static float f44(float x, float y)
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
float x;
bool pass = true;
@@ -396,3 +400,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
index 5c7515b0f0f6cd..9f6c87a0df015b 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
index c03fe5557aa269..e7bad46b084177 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
index 05faf3938d08eb..53a19494c29cf5 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
index 9c1afa7c544210..e718279daddec2 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs b/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs
index 740e9e3969ed50..407bac354fb41d 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat.cs
@@ -2,10 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class test
+namespace Test_r4flat_cs
{
- public static int Main()
+public class test
+{
+ [Fact]
+ public static int TestEntryPoint()
{
float x;
float y;
@@ -271,3 +275,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
index e2548c848078d8..17c9ad7d050caf 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
index a4ff63b59174aa..ccabbdc8860a16 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
index 52460dc637b3cd..c3895441b31cad 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
index 2dea1df4e783eb..454bcec299dee1 100644
--- a/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8.cs b/src/tests/JIT/Methodical/AsgOp/r8/r8.cs
index 746cb95674b338..b922a458472276 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8.cs
@@ -2,8 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class test
+namespace Test_r8_cs
+{
+public class test
{
private static double f00(double x, double y)
{
@@ -156,7 +159,8 @@ private static double f44(double x, double y)
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
double x;
bool pass = true;
@@ -370,3 +374,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
index 373857fd8e7f6c..55b5a0fd875279 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
index cae872684f87d0..5b2b328e028dfd 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
index 195ce7e88c938e..6bf2b5c2c0d0fe 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
index 58a1e7184b52a5..b8bcdae4a3b365 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs b/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs
index 6a5f623bfa721e..589832c58ab87f 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat.cs
@@ -2,10 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class test
+namespace Test_r8flat_cs
{
- public static int Main()
+public class test
+{
+ [Fact]
+ public static int TestEntryPoint()
{
double x;
double y;
@@ -271,3 +275,4 @@ public static int Main()
return 1;
}
}
+}
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
index 83abbaee0cb4ac..6a5ab9d69119d2 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
index 26af1b3a683926..26f4d51aa87fb4 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
index 46c96f35a82ead..a3b191fe8884e9 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
index 936b3460e1750f..e05fc3eb00db8b 100644
--- a/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
+++ b/src/tests/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs
index f16104b1627d08..37b41585259d26 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.cs
@@ -2,13 +2,15 @@
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Runtime.Intrinsics;
+using Xunit;
public class KeepAliveBoxFieldsTest
{
private static string _failedTest;
private static string _failedFieldName;
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
TestLocalsOneBlock();
Reset();
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj
index 9dc98caff81a80..edca7b94fa4341 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/KeepAliveBoxOpt.csproj
@@ -1,6 +1,5 @@
- Exe
PdbOnly
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array.il b/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
index b6fd3e93f75e2a..aa58277823c6fc 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array.il
@@ -9,10 +9,10 @@
}
.assembly 'array' { }
.assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_array_boxunbox_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
{
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
index 7dc4ef6f3622ba..02a208431d3344 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
index f852cae8a5c3b2..5ca46a8bc1a15b 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/array_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il b/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
index f5c13d7df74b82..dbaca559ab8250 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain.il
@@ -9,10 +9,10 @@
}
.assembly 'chain' { }
.assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_chain_boxunbox_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
{
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
index e69b221904c0b5..460a0f66cac78d 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
index 4317eefeeb631c..3f629d1397b1ce 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/chain_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il b/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
index 00724e62a9efca..2e9140277ed878 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally.il
@@ -10,9 +10,9 @@
.assembly extern mscorlib { }
.assembly 'finally' { }
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_finally_boxunbox
{
- .class private auto ansi beforefieldinit App
+ .class public auto ansi beforefieldinit App
extends [mscorlib]System.Object
{
.method private hidebysig static void
@@ -182,7 +182,7 @@
ret
} // end of method App::Test
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -192,9 +192,9 @@
.maxstack 1
.locals (int32 V_0)
IL_0000: ldc.i4.0
- IL_0001: call void JitTest.App::Test(bool)
+ IL_0001: call void JitTest_finally_boxunbox.App::Test(bool)
IL_0006: ldc.i4.1
- IL_0007: call void JitTest.App::Test(bool)
+ IL_0007: call void JitTest_finally_boxunbox.App::Test(bool)
IL_000c: ldstr "=== TEST PASSED ==="
IL_0011: call void [System.Console]System.Console::WriteLine(string)
IL_0016: ldc.i4.s 100
@@ -216,5 +216,5 @@
} // end of class App
-} // end of namespace JitTest
+} // end of namespace JitTest_finally_boxunbox
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
index 59b63c4f754358..7b75a53474d880 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
index 62f8bf6c98b883..e5515a562bfe20 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/finally_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
index ba9c6cfab177d3..33eec92d301976 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter.il
@@ -10,9 +10,9 @@
.assembly extern mscorlib { }
.assembly 'huge_filter' { }
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_huge_filter_boxunbox
{
- .class private auto ansi beforefieldinit App
+ .class public auto ansi beforefieldinit App
extends [mscorlib]System.Object
{
.method private hidebysig static void
@@ -179,7 +179,7 @@
.try IL_TRY to IL_FILTER filter IL_FILTER handler IL_EXCEPT to IL_END
} // end of method App::Test
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -189,9 +189,9 @@
.maxstack 1
.locals (int32 V_0)
IL_0000: ldc.i4.0
- IL_0001: call void JitTest.App::Test(bool)
+ IL_0001: call void JitTest_huge_filter_boxunbox.App::Test(bool)
IL_0006: ldc.i4.1
- IL_0007: call void JitTest.App::Test(bool)
+ IL_0007: call void JitTest_huge_filter_boxunbox.App::Test(bool)
IL_000c: ldstr "=== TEST PASSED ==="
IL_0011: call void [System.Console]System.Console::WriteLine(string)
IL_0016: ldc.i4.s 100
@@ -213,5 +213,5 @@
} // end of class App
-} // end of namespace JitTest
+} // end of namespace JitTest_huge_filter_boxunbox
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
index 3a87321418ef13..7edd0a5e0908dd 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
index 64dae6a21d88e2..60ee26c8311656 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/huge_filter_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il b/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
index 0541f08a632ea1..680cb9500e336b 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump.il
@@ -10,9 +10,9 @@
.assembly extern mscorlib { }
.assembly 'jump' { }
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_jump_boxunbox
{
- .class private auto ansi beforefieldinit App
+ .class public auto ansi beforefieldinit App
extends [mscorlib]System.Object
{
.method private hidebysig static int64
@@ -178,11 +178,11 @@
pop
ldc.i4.0
starg 0
- jmp int64 JitTest.App::Test(bool)
+ jmp int64 JitTest_jump_boxunbox.App::Test(bool)
IL_RET: ret
} // end of method App::Test
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -192,9 +192,9 @@
.maxstack 4
.locals (int32 V_0)
IL_0000: ldc.i4.0
- IL_0001: call int64 JitTest.App::Test(bool)
+ IL_0001: call int64 JitTest_jump_boxunbox.App::Test(bool)
IL_0006: ldc.i4.1
- IL_0007: call int64 JitTest.App::Test(bool)
+ IL_0007: call int64 JitTest_jump_boxunbox.App::Test(bool)
pop
pop
IL_000c: ldstr "=== TEST PASSED ==="
@@ -218,5 +218,5 @@
} // end of class App
-} // end of namespace JitTest
+} // end of namespace JitTest_jump_boxunbox
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
index 22edaba8fde057..dffe0de0eebf91 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
index a851f2a491c262..a503dfea831cb5 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/jump_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local.il b/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
index ca0b40bc80a9f4..646f84004c224c 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local.il
@@ -9,10 +9,10 @@
}
.assembly 'local' { }
.assembly extern xunit.core {}
-.namespace JitTest {
-.class private auto ansi beforefieldinit Test extends [mscorlib]System.Object
+.namespace JitTest_local_boxunbox_il {
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
{
-.method private hidebysig static int32 Main() cil managed
+.method public hidebysig static int32 Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
index 897ba51b65b5e3..a0f837e77b7f7a 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
index 9c7253101918fc..70e5d382279946 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/local_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
index 56436a78ebae76..519a13ae8650c4 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc.il
@@ -10,9 +10,9 @@
.assembly extern mscorlib { }
.assembly 'localloc_boxunbox' { }
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_localloc_boxunbox
{
- .class private auto ansi beforefieldinit App
+ .class public auto ansi beforefieldinit App
extends [mscorlib]System.Object
{
.method private hidebysig static void
@@ -177,7 +177,7 @@
IL_01e9: ret
} // end of method App::Test
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -187,9 +187,9 @@
.maxstack 1
.locals (int32 V_0)
IL_0000: ldc.i4.0
- IL_0001: call void JitTest.App::Test(bool)
+ IL_0001: call void JitTest_localloc_boxunbox.App::Test(bool)
IL_0006: ldc.i4.1
- IL_0007: call void JitTest.App::Test(bool)
+ IL_0007: call void JitTest_localloc_boxunbox.App::Test(bool)
IL_000c: ldstr "=== TEST PASSED ==="
IL_0011: call void [System.Console]System.Console::WriteLine(string)
IL_0016: ldc.i4.s 100
@@ -211,5 +211,5 @@
} // end of class App
-} // end of namespace JitTest
+} // end of namespace JitTest_localloc_boxunbox
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
index 7c26f8a1824df3..9ead303dbf4e98 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
index fd6eaf6f4f6623..bb256aa51afecc 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/localloc_boxunbox_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il b/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
index 2a5fb5129550e6..a0c676f929a8b7 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple.il
@@ -10,9 +10,9 @@
.assembly extern mscorlib { }
.assembly 'simple' { }
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_simple_boxunbox
{
- .class private auto ansi beforefieldinit App
+ .class public auto ansi beforefieldinit App
extends [mscorlib]System.Object
{
.method private hidebysig static void
@@ -172,7 +172,7 @@
IL_01e9: ret
} // end of method App::Test
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -182,9 +182,9 @@
.maxstack 1
.locals (int32 V_0)
IL_0000: ldc.i4.0
- IL_0001: call void JitTest.App::Test(bool)
+ IL_0001: call void JitTest_simple_boxunbox.App::Test(bool)
IL_0006: ldc.i4.1
- IL_0007: call void JitTest.App::Test(bool)
+ IL_0007: call void JitTest_simple_boxunbox.App::Test(bool)
IL_000c: ldstr "=== TEST PASSED ==="
IL_0011: call void [System.Console]System.Console::WriteLine(string)
IL_0016: ldc.i4.s 100
@@ -206,5 +206,5 @@
} // end of class App
-} // end of namespace JitTest
+} // end of namespace JitTest_simple_boxunbox
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
index 0f10f9db1bcc59..14f90de11ba45d 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
index b77928a47707b3..cbf627bb8599af 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/simple_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
index 3ca39e2a949438..73473f18f70fcd 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall.il
@@ -7,9 +7,9 @@
.assembly 'tailcall_boxunbox' { }
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_tailcall_boxunbox
{
- .class private auto ansi beforefieldinit App
+ .class public auto ansi beforefieldinit App
extends [mscorlib]System.Object
{
.method private hidebysig static int64
@@ -172,11 +172,11 @@
brfalse.s IL_RET
pop
ldc.i4.0
- tail. call int64 JitTest.App::Test(bool)
+ tail. call int64 JitTest_tailcall_boxunbox.App::Test(bool)
IL_RET: ret
} // end of method App::Test
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -186,9 +186,9 @@
.maxstack 4
.locals (int32 V_0)
IL_0000: ldc.i4.0
- IL_0001: call int64 JitTest.App::Test(bool)
+ IL_0001: call int64 JitTest_tailcall_boxunbox.App::Test(bool)
IL_0006: ldc.i4.1
- IL_0007: call int64 JitTest.App::Test(bool)
+ IL_0007: call int64 JitTest_tailcall_boxunbox.App::Test(bool)
pop
pop
IL_000c: ldstr "=== TEST PASSED ==="
@@ -212,5 +212,5 @@
} // end of class App
-} // end of namespace JitTest
+} // end of namespace JitTest_tailcall_boxunbox
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
index e2de19320855df..016dc7948fef1a 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
index 72bf4abc368079..306a35dc708afa 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/tailcall_boxunbox_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try.il b/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
index 3f4484c6c2e514..4daea08b91f46f 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try.il
@@ -10,9 +10,9 @@
.assembly extern mscorlib { }
.assembly 'try_boxunbox' { }
.assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_try_boxunbox
{
- .class private auto ansi beforefieldinit App
+ .class public auto ansi beforefieldinit App
extends [mscorlib]System.Object
{
.method private hidebysig static void
@@ -179,7 +179,7 @@
ret
} // end of method App::Test
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() cil managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -189,9 +189,9 @@
.maxstack 1
.locals (int32 V_0)
IL_0000: ldc.i4.0
- IL_0001: call void JitTest.App::Test(bool)
+ IL_0001: call void JitTest_try_boxunbox.App::Test(bool)
IL_0006: ldc.i4.1
- IL_0007: call void JitTest.App::Test(bool)
+ IL_0007: call void JitTest_try_boxunbox.App::Test(bool)
IL_000c: ldstr "=== TEST PASSED ==="
IL_0011: call void [System.Console]System.Console::WriteLine(string)
IL_0016: ldc.i4.s 100
@@ -213,5 +213,5 @@
} // end of class App
-} // end of namespace JitTest
+} // end of namespace JitTest_try_boxunbox
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
index f6fb0e05ab386c..682ab9d3e48342 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_d.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
index b7b089abf66e20..52ec4c2dd29017 100644
--- a/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
+++ b/src/tests/JIT/Methodical/Boxing/boxunbox/try_boxunbox_il_r.ilproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance.cs b/src/tests/JIT/Methodical/Boxing/callconv/instance.cs
index 8a74c65b0c7459..ece448e663a5ee 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance.cs
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance.cs
@@ -3,16 +3,17 @@
using System;
+using Xunit;
-namespace BoxTest
+namespace BoxTest_instance_cs
{
- internal abstract class BaseTest
+ public abstract class BaseTest
{
protected abstract object Fibonacci2(object num, object flag);
}
- internal class Test : BaseTest
+ public class Test : BaseTest
{
private object _num;
@@ -49,7 +50,8 @@ public object Print()
return _num;
}
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
Test test = new Test(20.0d);
test.Print();
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance.il b/src/tests/JIT/Methodical/Boxing/callconv/instance.il
index 0d6d53a562aa8d..b320d7d6da829f 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance.il
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance.il
@@ -14,7 +14,7 @@
{
}
.assembly extern xunit.core {}
-.namespace BoxTest
+.namespace BoxTest_instance_il
{
.class abstract auto ansi BaseTest extends [mscorlib]System.Object
{
@@ -33,7 +33,7 @@
} // end of class 'BaseTest'
- .class auto ansi Test extends BoxTest.BaseTest
+ .class public auto ansi Test extends BoxTest_instance_il.BaseTest
{
.field private class System.Object m_num
.method family hidebysig instance class System.Object
@@ -59,7 +59,7 @@
IL_002a: ldarg.0
IL_002b: ldarg.1
IL_002c: ldarg.2
- IL_002d: callvirt instance class System.Object BoxTest.BaseTest::Fibonacci2(class System.Object,
+ IL_002d: callvirt instance class System.Object BoxTest_instance_il.BaseTest::Fibonacci2(class System.Object,
class System.Object)
IL_0032: ret
} // end of method 'Test::Fibonacci'
@@ -96,7 +96,7 @@
IL_002e: stloc.2
IL_002f: ldloc.s V_2
IL_0031: box [mscorlib]System.Boolean
- IL_0036: call instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+ IL_0036: call instance class System.Object BoxTest_instance_il.Test::Fibonacci(class System.Object,
class System.Object)
IL_003b: unbox [mscorlib]System.Single
IL_0040: ldind.r4
@@ -110,7 +110,7 @@
IL_0050: ldloc.s V_1
IL_0052: box [mscorlib]System.Single
IL_0057: ldarg.2
- IL_0058: call instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+ IL_0058: call instance class System.Object BoxTest_instance_il.Test::Fibonacci(class System.Object,
class System.Object)
IL_005d: unbox [mscorlib]System.Single
IL_0062: ldind.r4
@@ -140,7 +140,7 @@
.maxstack 2
.locals ([0] float32 V_0)
IL_0000: ldarg.0
- IL_0001: call instance void BoxTest.BaseTest::.ctor()
+ IL_0001: call instance void BoxTest_instance_il.BaseTest::.ctor()
IL_0006: ldarg.0
IL_0007: ldarg.1
IL_0008: unbox [mscorlib]System.Double
@@ -149,7 +149,7 @@
IL_000f: stloc.0
IL_0010: ldloc.s V_0
IL_0012: box [mscorlib]System.Single
- IL_0017: stfld class System.Object BoxTest.Test::m_num
+ IL_0017: stfld class System.Object BoxTest_instance_il.Test::m_num
IL_001c: ret
} // end of method 'Test::.ctor'
@@ -160,21 +160,21 @@
.locals ([0] bool V_0)
IL_0000: ldarg.0
IL_0001: ldarg.0
- IL_0002: ldfld class System.Object BoxTest.Test::m_num
+ IL_0002: ldfld class System.Object BoxTest_instance_il.Test::m_num
IL_0007: ldc.i4.1
IL_0008: stloc.0
IL_0009: ldloc.s V_0
IL_000b: box [mscorlib]System.Boolean
- IL_0010: call instance class System.Object BoxTest.Test::Fibonacci(class System.Object,
+ IL_0010: call instance class System.Object BoxTest_instance_il.Test::Fibonacci(class System.Object,
class System.Object)
IL_0015: pop
IL_0016: call void [System.Console]System.Console::WriteLine()
IL_001b: ldarg.0
- IL_001c: ldfld class System.Object BoxTest.Test::m_num
+ IL_001c: ldfld class System.Object BoxTest_instance_il.Test::m_num
IL_0021: ret
} // end of method 'Test::Print'
- .method private hidebysig static int32
+ .method public hidebysig static int32
Main() il managed
{
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -182,16 +182,16 @@
)
.entrypoint
.maxstack 2
- .locals ([0] class BoxTest.Test test,
+ .locals ([0] class BoxTest_instance_il.Test test,
[1] float64 V_1)
IL_0000: ldc.r8 20.
IL_0009: stloc.1
IL_000a: ldloc.s V_1
IL_000c: box [mscorlib]System.Double
- IL_0011: newobj instance void BoxTest.Test::.ctor(class System.Object)
+ IL_0011: newobj instance void BoxTest_instance_il.Test::.ctor(class System.Object)
IL_0016: stloc.0
IL_0017: ldloc.0
- IL_0018: call instance class System.Object BoxTest.Test::Print()
+ IL_0018: call instance class System.Object BoxTest_instance_il.Test::Print()
IL_001d: pop
IL_001e: ldstr "*** PASSED ***"
IL_0023: call void [System.Console]System.Console::WriteLine(class System.String)
@@ -201,5 +201,5 @@
} // end of class 'Test'
-} // end of namespace 'BoxTest'
+} // end of namespace 'BoxTest_instance_il'
diff --git a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj
index 7ad232f7846dcf..dc79a6298a6b93 100644
--- a/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj
+++ b/src/tests/JIT/Methodical/Boxing/callconv/instance_cs_d.csproj
@@ -1,6 +1,5 @@
-