Fix running tests with process isolation under naot#100331

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
MichalStrehovsky merged 13 commits into from
Apr 23, 2024
Merged

Fix running tests with process isolation under naot #100331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
72c63c8
Fix running tests with process isolation under naot
MichalStrehovsky Mar 27, 2024
88558f3
ffs
MichalStrehovsky Mar 27, 2024
6071d62
Merge branch 'main' into mergedrnnr
MichalStrehovsky Apr 11, 2024
03216f1
fixes
MichalStrehovsky Apr 12, 2024
6da251e
Update test22888.csproj
MichalStrehovsky Apr 18, 2024
fa7960d
Merge branch 'main' into mergedrnnr
MichalStrehovsky Apr 18, 2024
8fb7b9d
more baselines
MichalStrehovsky Apr 19, 2024
d5101fe
More baselines
MichalStrehovsky Apr 22, 2024
26dcce4
Debug strange ARM32 infra issue
MichalStrehovsky Apr 22, 2024
c2965dd
More debugging ARM32
MichalStrehovsky Apr 22, 2024
a679d7b
Revert "More debugging ARM32"
MichalStrehovsky Apr 23, 2024
c428f33
Revert "Debug strange ARM32 infra issue"
MichalStrehovsky Apr 23, 2024
ea7f989
One more attempt
MichalStrehovsky Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/tests/Common/CLRTest.Jit.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
DependsOnTargets="GetDisasmCheckData">
<PropertyGroup>
<HasBashDisasmCheck>false</HasBashDisasmCheck>
<HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
<HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

<BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
<BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
DependsOnTargets="GetDisasmCheckData">
<PropertyGroup>
<HasBatchDisasmCheck>false</HasBatchDisasmCheck>
<HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
<HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

<BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
<BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down
12 changes: 9 additions & 3 deletions src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
&& !OperatingSystem.IsBrowser()
&& !OperatingSystem.IsOSPlatform("Wasi");

public static void RunOutOfProcessTest(string assemblyPath)
public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
{
int ret = -100;
string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
{
CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

string testScriptPath = assemblyPath;
if (testPathPrefix != null)
testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

if (OperatingSystem.IsWindows())
{
testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
}
else
{
testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
}

if (!File.Exists(testExecutable))
{
Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

// Skip platform-specific test when running on the excluded platform
return;
}
Expand Down
7 changes: 5 additions & 2 deletions src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
private CodeBuilder _executionStatement { get; }
private string RelativeAssemblyPath { get; }

public OutOfProcessTest(string displayName, string relativeAssemblyPath)
public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
{
Method = displayName;
DisplayNameForFiltering = displayName;
TestNameExpression = $"@\"{displayName}\"";
RelativeAssemblyPath = relativeAssemblyPath;

// Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

_executionStatement = new CodeBuilder();
_executionStatement.AppendLine();
_executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

using (_executionStatement.NewBracesScope())
{
_executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
+ $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
+ $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
private const string PriorityOption = "build_property.Priority";
private const string TestBuildModeOption = "build_property.TestBuildMode";
private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
string? testDisplayName = fileOptions.TestDisplayName();
if (assemblyPath is not null && testDisplayName is not null)
{
return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
}
}

Expand Down
1 change: 1 addition & 0 deletions src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
<CompilerVisibleProperty Include="TargetOS" />
<CompilerVisibleProperty Include="TargetArchitecture" />
<CompilerVisibleProperty Include="Priority" />
<CompilerVisibleProperty Include="TestBuildMode" />
<!-- Properties that influence test harness generation -->
<CompilerVisibleProperty Include="InMergedTestDirectory" />
<CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
<PropertyGroup>
<!-- Needed for JitOptimizationSensitive -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>

<!-- Not even printf is AOT compatible in F# -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<PropertyGroup>
<NoStandardLib>True</NoStandardLib>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
<Optimize>True</Optimize>
<TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
<GCStressIncompatible>True</GCStressIncompatible>

<!-- Not even printf is AOT compatible in F# -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="Runtime_72845.fs" />
Expand Down
3 changes: 3 additions & 0 deletions src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
<!-- Needed for GC.WaitForPendingFinalizers -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- Uses AssemblyLoadContext -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="test22888.cs" />
Expand Down
49 changes: 49 additions & 0 deletions src/tests/issues.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

<!-- NativeAOT specific -->
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
<Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
<Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
</ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
</ExcludeList>
</ItemGroup>

<!-- NativeAOT x86 specific -->
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
<Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
<Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
<Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
<Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
<Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
<Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
<Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
<Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
<Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
<Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
<Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
<Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
</ExcludeList>
</ItemGroup>

<!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix running tests with process isolation under naot#100331

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

MichalStrehovsky
merged 13 commits into

from

Apr 23, 2024
 Merged


Fix running tests with process isolation under naot
#100331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
72c63c8

Fix running tests with process isolation under naot


MichalStrehovsky Mar 27, 2024
88558f3

ffs


MichalStrehovsky Mar 27, 2024
6071d62

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 11, 2024
03216f1

fixes


MichalStrehovsky Apr 12, 2024
6da251e

Update test22888.csproj


MichalStrehovsky Apr 18, 2024
fa7960d

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 18, 2024
8fb7b9d

more baselines


MichalStrehovsky Apr 19, 2024
d5101fe

More baselines


MichalStrehovsky Apr 22, 2024
26dcce4

Debug strange ARM32 infra issue


MichalStrehovsky Apr 22, 2024
c2965dd

More debugging ARM32


MichalStrehovsky Apr 22, 2024
a679d7b

Revert "More debugging ARM32"


MichalStrehovsky Apr 23, 2024
c428f33

Revert "Debug strange ARM32 infra issue"


MichalStrehovsky Apr 23, 2024
ea7f989

One more attempt


MichalStrehovsky Apr 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/tests/Common/CLRTest.Jit.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBashDisasmCheck>false</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

 <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
 <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

 <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
 <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down

12 changes: 9 additions & 3 deletions
src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
 && !OperatingSystem.IsBrowser()
 && !OperatingSystem.IsOSPlatform("Wasi");

 public static void RunOutOfProcessTest(string assemblyPath)
 public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
 {
 int ret = -100;
 string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
 {
 CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

 string testScriptPath = assemblyPath;
 if (testPathPrefix != null)
 testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

 if (OperatingSystem.IsWindows())
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
 }
 else
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
 }

 if (!File.Exists(testExecutable))
 {
 Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

 // Skip platform-specific test when running on the excluded platform
 return;
 }
Expand Down

7 changes: 5 additions & 2 deletions
src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
 private CodeBuilder _executionStatement { get; }
 private string RelativeAssemblyPath { get; }

 public OutOfProcessTest(string displayName, string relativeAssemblyPath)
 public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
 {
 Method = displayName;
 DisplayNameForFiltering = displayName;
 TestNameExpression = $"@\"{displayName}\"";
 RelativeAssemblyPath = relativeAssemblyPath;

 // Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
 string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

 _executionStatement = new CodeBuilder();
 _executionStatement.AppendLine();
 _executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

 using (_executionStatement.NewBracesScope())
 {
 _executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
 }
 }

Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
 private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
 private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
 private const string PriorityOption = "build_property.Priority";
 private const string TestBuildModeOption = "build_property.TestBuildMode";
 private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
 private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
 private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

 internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

 internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

 internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

 internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down

2 changes: 1 addition & 1 deletion
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 string? testDisplayName = fileOptions.TestDisplayName();
 if (assemblyPath is not null && testDisplayName is not null)
 {
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
 <CompilerVisibleProperty Include="TargetOS" />
 <CompilerVisibleProperty Include="TargetArchitecture" />
 <CompilerVisibleProperty Include="Priority" />
 <CompilerVisibleProperty Include="TestBuildMode" />
 <!-- Properties that influence test harness generation -->
 <CompilerVisibleProperty Include="InMergedTestDirectory" />
 <CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
 <PropertyGroup>
 <!-- Needed for JitOptimizationSensitive -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <PropertyGroup>
 <NoStandardLib>True</NoStandardLib>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
 <Optimize>True</Optimize>
 <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
 <GCStressIncompatible>True</GCStressIncompatible>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Runtime_72845.fs" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

 <!-- Uses AssemblyLoadContext -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="test22888.cs" />
Expand Down

49 changes: 49 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

 <!-- NativeAOT specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
 <Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
 <Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
 </ExcludeList>
 </ItemGroup>

 <!-- NativeAOT x86 specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
 <Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
 Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
 and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix running tests with process isolation under naot#100331

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

MichalStrehovsky
merged 13 commits into

from

Apr 23, 2024
 Merged


Fix running tests with process isolation under naot
#100331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
72c63c8

Fix running tests with process isolation under naot


MichalStrehovsky Mar 27, 2024
88558f3

ffs


MichalStrehovsky Mar 27, 2024
6071d62

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 11, 2024
03216f1

fixes


MichalStrehovsky Apr 12, 2024
6da251e

Update test22888.csproj


MichalStrehovsky Apr 18, 2024
fa7960d

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 18, 2024
8fb7b9d

more baselines


MichalStrehovsky Apr 19, 2024
d5101fe

More baselines


MichalStrehovsky Apr 22, 2024
26dcce4

Debug strange ARM32 infra issue


MichalStrehovsky Apr 22, 2024
c2965dd

More debugging ARM32


MichalStrehovsky Apr 22, 2024
a679d7b

Revert "More debugging ARM32"


MichalStrehovsky Apr 23, 2024
c428f33

Revert "Debug strange ARM32 infra issue"


MichalStrehovsky Apr 23, 2024
ea7f989

One more attempt


MichalStrehovsky Apr 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/tests/Common/CLRTest.Jit.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBashDisasmCheck>false</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

 <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
 <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

 <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
 <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down

12 changes: 9 additions & 3 deletions
src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
 && !OperatingSystem.IsBrowser()
 && !OperatingSystem.IsOSPlatform("Wasi");

 public static void RunOutOfProcessTest(string assemblyPath)
 public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
 {
 int ret = -100;
 string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
 {
 CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

 string testScriptPath = assemblyPath;
 if (testPathPrefix != null)
 testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

 if (OperatingSystem.IsWindows())
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
 }
 else
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
 }

 if (!File.Exists(testExecutable))
 {
 Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

 // Skip platform-specific test when running on the excluded platform
 return;
 }
Expand Down

7 changes: 5 additions & 2 deletions
src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
 private CodeBuilder _executionStatement { get; }
 private string RelativeAssemblyPath { get; }

 public OutOfProcessTest(string displayName, string relativeAssemblyPath)
 public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
 {
 Method = displayName;
 DisplayNameForFiltering = displayName;
 TestNameExpression = $"@\"{displayName}\"";
 RelativeAssemblyPath = relativeAssemblyPath;

 // Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
 string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

 _executionStatement = new CodeBuilder();
 _executionStatement.AppendLine();
 _executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

 using (_executionStatement.NewBracesScope())
 {
 _executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
 }
 }

Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
 private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
 private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
 private const string PriorityOption = "build_property.Priority";
 private const string TestBuildModeOption = "build_property.TestBuildMode";
 private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
 private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
 private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

 internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

 internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

 internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

 internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down

2 changes: 1 addition & 1 deletion
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 string? testDisplayName = fileOptions.TestDisplayName();
 if (assemblyPath is not null && testDisplayName is not null)
 {
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
 <CompilerVisibleProperty Include="TargetOS" />
 <CompilerVisibleProperty Include="TargetArchitecture" />
 <CompilerVisibleProperty Include="Priority" />
 <CompilerVisibleProperty Include="TestBuildMode" />
 <!-- Properties that influence test harness generation -->
 <CompilerVisibleProperty Include="InMergedTestDirectory" />
 <CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
 <PropertyGroup>
 <!-- Needed for JitOptimizationSensitive -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <PropertyGroup>
 <NoStandardLib>True</NoStandardLib>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
 <Optimize>True</Optimize>
 <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
 <GCStressIncompatible>True</GCStressIncompatible>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Runtime_72845.fs" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

 <!-- Uses AssemblyLoadContext -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="test22888.cs" />
Expand Down

49 changes: 49 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

 <!-- NativeAOT specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
 <Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
 <Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
 </ExcludeList>
 </ItemGroup>

 <!-- NativeAOT x86 specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
 <Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
 Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
 and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix running tests with process isolation under naot#100331

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

MichalStrehovsky
merged 13 commits into

from

Apr 23, 2024
 Merged


Fix running tests with process isolation under naot
#100331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
72c63c8

Fix running tests with process isolation under naot


MichalStrehovsky Mar 27, 2024
88558f3

ffs


MichalStrehovsky Mar 27, 2024
6071d62

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 11, 2024
03216f1

fixes


MichalStrehovsky Apr 12, 2024
6da251e

Update test22888.csproj


MichalStrehovsky Apr 18, 2024
fa7960d

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 18, 2024
8fb7b9d

more baselines


MichalStrehovsky Apr 19, 2024
d5101fe

More baselines


MichalStrehovsky Apr 22, 2024
26dcce4

Debug strange ARM32 infra issue


MichalStrehovsky Apr 22, 2024
c2965dd

More debugging ARM32


MichalStrehovsky Apr 22, 2024
a679d7b

Revert "More debugging ARM32"


MichalStrehovsky Apr 23, 2024
c428f33

Revert "Debug strange ARM32 infra issue"


MichalStrehovsky Apr 23, 2024
ea7f989

One more attempt


MichalStrehovsky Apr 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/tests/Common/CLRTest.Jit.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBashDisasmCheck>false</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

 <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
 <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

 <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
 <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down

12 changes: 9 additions & 3 deletions
src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
 && !OperatingSystem.IsBrowser()
 && !OperatingSystem.IsOSPlatform("Wasi");

 public static void RunOutOfProcessTest(string assemblyPath)
 public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
 {
 int ret = -100;
 string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
 {
 CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

 string testScriptPath = assemblyPath;
 if (testPathPrefix != null)
 testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

 if (OperatingSystem.IsWindows())
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
 }
 else
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
 }

 if (!File.Exists(testExecutable))
 {
 Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

 // Skip platform-specific test when running on the excluded platform
 return;
 }
Expand Down

7 changes: 5 additions & 2 deletions
src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
 private CodeBuilder _executionStatement { get; }
 private string RelativeAssemblyPath { get; }

 public OutOfProcessTest(string displayName, string relativeAssemblyPath)
 public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
 {
 Method = displayName;
 DisplayNameForFiltering = displayName;
 TestNameExpression = $"@\"{displayName}\"";
 RelativeAssemblyPath = relativeAssemblyPath;

 // Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
 string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

 _executionStatement = new CodeBuilder();
 _executionStatement.AppendLine();
 _executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

 using (_executionStatement.NewBracesScope())
 {
 _executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
 }
 }

Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
 private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
 private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
 private const string PriorityOption = "build_property.Priority";
 private const string TestBuildModeOption = "build_property.TestBuildMode";
 private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
 private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
 private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

 internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

 internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

 internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

 internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down

2 changes: 1 addition & 1 deletion
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 string? testDisplayName = fileOptions.TestDisplayName();
 if (assemblyPath is not null && testDisplayName is not null)
 {
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
 <CompilerVisibleProperty Include="TargetOS" />
 <CompilerVisibleProperty Include="TargetArchitecture" />
 <CompilerVisibleProperty Include="Priority" />
 <CompilerVisibleProperty Include="TestBuildMode" />
 <!-- Properties that influence test harness generation -->
 <CompilerVisibleProperty Include="InMergedTestDirectory" />
 <CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
 <PropertyGroup>
 <!-- Needed for JitOptimizationSensitive -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <PropertyGroup>
 <NoStandardLib>True</NoStandardLib>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
 <Optimize>True</Optimize>
 <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
 <GCStressIncompatible>True</GCStressIncompatible>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Runtime_72845.fs" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

 <!-- Uses AssemblyLoadContext -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="test22888.cs" />
Expand Down

49 changes: 49 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

 <!-- NativeAOT specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
 <Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
 <Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
 </ExcludeList>
 </ItemGroup>

 <!-- NativeAOT x86 specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
 <Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
 Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
 and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix running tests with process isolation under naot#100331

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

MichalStrehovsky
merged 13 commits into

from

Apr 23, 2024
 Merged


Fix running tests with process isolation under naot
#100331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
72c63c8

Fix running tests with process isolation under naot


MichalStrehovsky Mar 27, 2024
88558f3

ffs


MichalStrehovsky Mar 27, 2024
6071d62

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 11, 2024
03216f1

fixes


MichalStrehovsky Apr 12, 2024
6da251e

Update test22888.csproj


MichalStrehovsky Apr 18, 2024
fa7960d

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 18, 2024
8fb7b9d

more baselines


MichalStrehovsky Apr 19, 2024
d5101fe

More baselines


MichalStrehovsky Apr 22, 2024
26dcce4

Debug strange ARM32 infra issue


MichalStrehovsky Apr 22, 2024
c2965dd

More debugging ARM32


MichalStrehovsky Apr 22, 2024
a679d7b

Revert "More debugging ARM32"


MichalStrehovsky Apr 23, 2024
c428f33

Revert "Debug strange ARM32 infra issue"


MichalStrehovsky Apr 23, 2024
ea7f989

One more attempt


MichalStrehovsky Apr 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/tests/Common/CLRTest.Jit.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBashDisasmCheck>false</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

 <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
 <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

 <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
 <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down

12 changes: 9 additions & 3 deletions
src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
 && !OperatingSystem.IsBrowser()
 && !OperatingSystem.IsOSPlatform("Wasi");

 public static void RunOutOfProcessTest(string assemblyPath)
 public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
 {
 int ret = -100;
 string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
 {
 CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

 string testScriptPath = assemblyPath;
 if (testPathPrefix != null)
 testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

 if (OperatingSystem.IsWindows())
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
 }
 else
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
 }

 if (!File.Exists(testExecutable))
 {
 Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

 // Skip platform-specific test when running on the excluded platform
 return;
 }
Expand Down

7 changes: 5 additions & 2 deletions
src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
 private CodeBuilder _executionStatement { get; }
 private string RelativeAssemblyPath { get; }

 public OutOfProcessTest(string displayName, string relativeAssemblyPath)
 public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
 {
 Method = displayName;
 DisplayNameForFiltering = displayName;
 TestNameExpression = $"@\"{displayName}\"";
 RelativeAssemblyPath = relativeAssemblyPath;

 // Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
 string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

 _executionStatement = new CodeBuilder();
 _executionStatement.AppendLine();
 _executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

 using (_executionStatement.NewBracesScope())
 {
 _executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
 }
 }

Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
 private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
 private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
 private const string PriorityOption = "build_property.Priority";
 private const string TestBuildModeOption = "build_property.TestBuildMode";
 private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
 private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
 private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

 internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

 internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

 internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

 internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down

2 changes: 1 addition & 1 deletion
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 string? testDisplayName = fileOptions.TestDisplayName();
 if (assemblyPath is not null && testDisplayName is not null)
 {
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
 <CompilerVisibleProperty Include="TargetOS" />
 <CompilerVisibleProperty Include="TargetArchitecture" />
 <CompilerVisibleProperty Include="Priority" />
 <CompilerVisibleProperty Include="TestBuildMode" />
 <!-- Properties that influence test harness generation -->
 <CompilerVisibleProperty Include="InMergedTestDirectory" />
 <CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
 <PropertyGroup>
 <!-- Needed for JitOptimizationSensitive -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <PropertyGroup>
 <NoStandardLib>True</NoStandardLib>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
 <Optimize>True</Optimize>
 <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
 <GCStressIncompatible>True</GCStressIncompatible>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Runtime_72845.fs" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

 <!-- Uses AssemblyLoadContext -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="test22888.cs" />
Expand Down

49 changes: 49 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

 <!-- NativeAOT specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
 <Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
 <Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
 </ExcludeList>
 </ItemGroup>

 <!-- NativeAOT x86 specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
 <Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
 Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
 and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix running tests with process isolation under naot#100331

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

MichalStrehovsky
merged 13 commits into

from

Apr 23, 2024
 Merged


Fix running tests with process isolation under naot
#100331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
72c63c8

Fix running tests with process isolation under naot


MichalStrehovsky Mar 27, 2024
88558f3

ffs


MichalStrehovsky Mar 27, 2024
6071d62

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 11, 2024
03216f1

fixes


MichalStrehovsky Apr 12, 2024
6da251e

Update test22888.csproj


MichalStrehovsky Apr 18, 2024
fa7960d

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 18, 2024
8fb7b9d

more baselines


MichalStrehovsky Apr 19, 2024
d5101fe

More baselines


MichalStrehovsky Apr 22, 2024
26dcce4

Debug strange ARM32 infra issue


MichalStrehovsky Apr 22, 2024
c2965dd

More debugging ARM32


MichalStrehovsky Apr 22, 2024
a679d7b

Revert "More debugging ARM32"


MichalStrehovsky Apr 23, 2024
c428f33

Revert "Debug strange ARM32 infra issue"


MichalStrehovsky Apr 23, 2024
ea7f989

One more attempt


MichalStrehovsky Apr 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/tests/Common/CLRTest.Jit.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBashDisasmCheck>false</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

 <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
 <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

 <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
 <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down

12 changes: 9 additions & 3 deletions
src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
 && !OperatingSystem.IsBrowser()
 && !OperatingSystem.IsOSPlatform("Wasi");

 public static void RunOutOfProcessTest(string assemblyPath)
 public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
 {
 int ret = -100;
 string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
 {
 CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

 string testScriptPath = assemblyPath;
 if (testPathPrefix != null)
 testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

 if (OperatingSystem.IsWindows())
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
 }
 else
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
 }

 if (!File.Exists(testExecutable))
 {
 Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

 // Skip platform-specific test when running on the excluded platform
 return;
 }
Expand Down

7 changes: 5 additions & 2 deletions
src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
 private CodeBuilder _executionStatement { get; }
 private string RelativeAssemblyPath { get; }

 public OutOfProcessTest(string displayName, string relativeAssemblyPath)
 public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
 {
 Method = displayName;
 DisplayNameForFiltering = displayName;
 TestNameExpression = $"@\"{displayName}\"";
 RelativeAssemblyPath = relativeAssemblyPath;

 // Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
 string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

 _executionStatement = new CodeBuilder();
 _executionStatement.AppendLine();
 _executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

 using (_executionStatement.NewBracesScope())
 {
 _executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
 }
 }

Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
 private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
 private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
 private const string PriorityOption = "build_property.Priority";
 private const string TestBuildModeOption = "build_property.TestBuildMode";
 private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
 private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
 private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

 internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

 internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

 internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

 internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down

2 changes: 1 addition & 1 deletion
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 string? testDisplayName = fileOptions.TestDisplayName();
 if (assemblyPath is not null && testDisplayName is not null)
 {
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
 <CompilerVisibleProperty Include="TargetOS" />
 <CompilerVisibleProperty Include="TargetArchitecture" />
 <CompilerVisibleProperty Include="Priority" />
 <CompilerVisibleProperty Include="TestBuildMode" />
 <!-- Properties that influence test harness generation -->
 <CompilerVisibleProperty Include="InMergedTestDirectory" />
 <CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
 <PropertyGroup>
 <!-- Needed for JitOptimizationSensitive -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <PropertyGroup>
 <NoStandardLib>True</NoStandardLib>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
 <Optimize>True</Optimize>
 <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
 <GCStressIncompatible>True</GCStressIncompatible>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Runtime_72845.fs" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

 <!-- Uses AssemblyLoadContext -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="test22888.cs" />
Expand Down

49 changes: 49 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

 <!-- NativeAOT specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
 <Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
 <Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
 </ExcludeList>
 </ItemGroup>

 <!-- NativeAOT x86 specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
 <Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
 Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
 and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix running tests with process isolation under naot#100331

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

MichalStrehovsky
merged 13 commits into

from

Apr 23, 2024
 Merged


Fix running tests with process isolation under naot
#100331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
72c63c8

Fix running tests with process isolation under naot


MichalStrehovsky Mar 27, 2024
88558f3

ffs


MichalStrehovsky Mar 27, 2024
6071d62

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 11, 2024
03216f1

fixes


MichalStrehovsky Apr 12, 2024
6da251e

Update test22888.csproj


MichalStrehovsky Apr 18, 2024
fa7960d

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 18, 2024
8fb7b9d

more baselines


MichalStrehovsky Apr 19, 2024
d5101fe

More baselines


MichalStrehovsky Apr 22, 2024
26dcce4

Debug strange ARM32 infra issue


MichalStrehovsky Apr 22, 2024
c2965dd

More debugging ARM32


MichalStrehovsky Apr 22, 2024
a679d7b

Revert "More debugging ARM32"


MichalStrehovsky Apr 23, 2024
c428f33

Revert "Debug strange ARM32 infra issue"


MichalStrehovsky Apr 23, 2024
ea7f989

One more attempt


MichalStrehovsky Apr 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/tests/Common/CLRTest.Jit.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBashDisasmCheck>false</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

 <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
 <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

 <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
 <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down

12 changes: 9 additions & 3 deletions
src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
 && !OperatingSystem.IsBrowser()
 && !OperatingSystem.IsOSPlatform("Wasi");

 public static void RunOutOfProcessTest(string assemblyPath)
 public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
 {
 int ret = -100;
 string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
 {
 CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

 string testScriptPath = assemblyPath;
 if (testPathPrefix != null)
 testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

 if (OperatingSystem.IsWindows())
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
 }
 else
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
 }

 if (!File.Exists(testExecutable))
 {
 Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

 // Skip platform-specific test when running on the excluded platform
 return;
 }
Expand Down

7 changes: 5 additions & 2 deletions
src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
 private CodeBuilder _executionStatement { get; }
 private string RelativeAssemblyPath { get; }

 public OutOfProcessTest(string displayName, string relativeAssemblyPath)
 public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
 {
 Method = displayName;
 DisplayNameForFiltering = displayName;
 TestNameExpression = $"@\"{displayName}\"";
 RelativeAssemblyPath = relativeAssemblyPath;

 // Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
 string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

 _executionStatement = new CodeBuilder();
 _executionStatement.AppendLine();
 _executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

 using (_executionStatement.NewBracesScope())
 {
 _executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
 }
 }

Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
 private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
 private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
 private const string PriorityOption = "build_property.Priority";
 private const string TestBuildModeOption = "build_property.TestBuildMode";
 private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
 private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
 private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

 internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

 internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

 internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

 internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down

2 changes: 1 addition & 1 deletion
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 string? testDisplayName = fileOptions.TestDisplayName();
 if (assemblyPath is not null && testDisplayName is not null)
 {
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
 <CompilerVisibleProperty Include="TargetOS" />
 <CompilerVisibleProperty Include="TargetArchitecture" />
 <CompilerVisibleProperty Include="Priority" />
 <CompilerVisibleProperty Include="TestBuildMode" />
 <!-- Properties that influence test harness generation -->
 <CompilerVisibleProperty Include="InMergedTestDirectory" />
 <CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
 <PropertyGroup>
 <!-- Needed for JitOptimizationSensitive -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <PropertyGroup>
 <NoStandardLib>True</NoStandardLib>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
 <Optimize>True</Optimize>
 <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
 <GCStressIncompatible>True</GCStressIncompatible>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Runtime_72845.fs" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

 <!-- Uses AssemblyLoadContext -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="test22888.cs" />
Expand Down

49 changes: 49 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

 <!-- NativeAOT specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
 <Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
 <Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
 </ExcludeList>
 </ItemGroup>

 <!-- NativeAOT x86 specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
 <Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
 Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
 and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix running tests with process isolation under naot#100331

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

MichalStrehovsky
merged 13 commits into

from

Apr 23, 2024
 Merged


Fix running tests with process isolation under naot
#100331
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
72c63c8

Fix running tests with process isolation under naot


MichalStrehovsky Mar 27, 2024
88558f3

ffs


MichalStrehovsky Mar 27, 2024
6071d62

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 11, 2024
03216f1

fixes


MichalStrehovsky Apr 12, 2024
6da251e

Update test22888.csproj


MichalStrehovsky Apr 18, 2024
fa7960d

Merge branch 'main' into mergedrnnr


MichalStrehovsky Apr 18, 2024
8fb7b9d

more baselines


MichalStrehovsky Apr 19, 2024
d5101fe

More baselines


MichalStrehovsky Apr 22, 2024
26dcce4

Debug strange ARM32 infra issue


MichalStrehovsky Apr 22, 2024
c2965dd

More debugging ARM32


MichalStrehovsky Apr 22, 2024
a679d7b

Revert "More debugging ARM32"


MichalStrehovsky Apr 23, 2024
c428f33

Revert "Debug strange ARM32 infra issue"


MichalStrehovsky Apr 23, 2024
ea7f989

One more attempt


MichalStrehovsky Apr 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
src/tests/Common/CLRTest.Jit.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,7 @@ IF NOT DEFINED DoLink (
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBashDisasmCheck>false</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>
 <HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot' and ('$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

 <BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>
 <BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>
Expand DownExpand Up@@ -184,7 +184,7 @@ fi
 DependsOnTargets="GetDisasmCheckData">
 <PropertyGroup>
 <HasBatchDisasmCheck>false</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>
 <HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</HasBatchDisasmCheck>

 <BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>
 <BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>
Expand Down

12 changes: 9 additions & 3 deletions
src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ static OutOfProcessTest()
 && !OperatingSystem.IsBrowser()
 && !OperatingSystem.IsOSPlatform("Wasi");

 public static void RunOutOfProcessTest(string assemblyPath)
 public static void RunOutOfProcessTest(string assemblyPath, string testPathPrefix)
 {
 int ret = -100;
 string baseDir = AppContext.BaseDirectory;
Expand All@@ -63,17 +63,23 @@ public static void RunOutOfProcessTest(string assemblyPath)
 {
 CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib();

 string testScriptPath = assemblyPath;
 if (testPathPrefix != null)
 testScriptPath = Path.Combine(testPathPrefix, testScriptPath);

 if (OperatingSystem.IsWindows())
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath, ".cmd"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath, ".cmd"));
 }
 else
 {
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh"));
 testExecutable = Path.Combine(baseDir, Path.ChangeExtension(testScriptPath.Replace("\\", "/"), ".sh"));
 }

 if (!File.Exists(testExecutable))
 {
 Console.WriteLine($"Test executable '{testExecutable}' not found, skipping.");

 // Skip platform-specific test when running on the excluded platform
 return;
 }
Expand Down

7 changes: 5 additions & 2 deletions
src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -336,21 +336,24 @@ public sealed class OutOfProcessTest : ITestInfo
 private CodeBuilder _executionStatement { get; }
 private string RelativeAssemblyPath { get; }

 public OutOfProcessTest(string displayName, string relativeAssemblyPath)
 public OutOfProcessTest(string displayName, string relativeAssemblyPath, string? testBuildMode)
 {
 Method = displayName;
 DisplayNameForFiltering = displayName;
 TestNameExpression = $"@\"{displayName}\"";
 RelativeAssemblyPath = relativeAssemblyPath;

 // Native AOT tests get generated into a 'native' directory, so we need to get out of that one first to find the test
 string testPathPrefix = string.Equals(testBuildMode, "nativeaot", StringComparison.OrdinalIgnoreCase) ? "\"..\"" : "null";

 _executionStatement = new CodeBuilder();
 _executionStatement.AppendLine();
 _executionStatement.AppendLine("if (TestLibrary.OutOfProcessTest.OutOfProcessTestsSupported)");

 using (_executionStatement.NewBracesScope())
 {
 _executionStatement.AppendLine($@"TestLibrary.OutOfProcessTest"
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"");");
 + $@".RunOutOfProcessTest(@""{relativeAssemblyPath}"", {testPathPrefix});");
 }
 }

Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Common/XUnitWrapperGenerator/OptionsHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ public static class OptionsHelper
 private const string InMergedTestDirectoryOption = "build_property.InMergedTestDirectory";
 private const string IsMergedTestRunnerAssemblyOption = "build_property.IsMergedTestRunnerAssembly";
 private const string PriorityOption = "build_property.Priority";
 private const string TestBuildModeOption = "build_property.TestBuildMode";
 private const string RuntimeFlavorOption = "build_property.RuntimeFlavor";
 private const string IsOutOfProcessTestAssemblyOption = "build_metadata.AdditionalFiles.IsOutOfProcessTestAssembly";
 private const string TestFilterOption = "build_property.TestFilter";
Expand DownExpand Up@@ -38,6 +39,8 @@ private static bool GetBoolOption(this AnalyzerConfigOptions options, string key

 internal static string RuntimeFlavor(this AnalyzerConfigOptions options) => options.TryGetValue(RuntimeFlavorOption, out string? flavor) ? flavor : "CoreCLR";

 internal static string? TestBuildMode(this AnalyzerConfigOptions options) => options.TryGetValue(TestBuildModeOption, out string? option) ? option : null;

 internal static bool IsOutOfProcessTestAssembly(this AnalyzerConfigOptions options) => options.GetBoolOption(IsOutOfProcessTestAssemblyOption);

 internal static string? TestFilter(this AnalyzerConfigOptions options) => options.TryGetValue(TestFilterOption, out string? filter) ? filter : null;
Expand Down

2 changes: 1 addition & 1 deletion
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 string? testDisplayName = fileOptions.TestDisplayName();
 if (assemblyPath is not null && testDisplayName is not null)
 {
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath));
 return ImmutableArray.Create<ITestInfo>(new OutOfProcessTest(testDisplayName, assemblyPath, fileOptions.TestBuildMode()));
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@
 <CompilerVisibleProperty Include="TargetOS" />
 <CompilerVisibleProperty Include="TargetArchitecture" />
 <CompilerVisibleProperty Include="Priority" />
 <CompilerVisibleProperty Include="TestBuildMode" />
 <!-- Properties that influence test harness generation -->
 <CompilerVisibleProperty Include="InMergedTestDirectory" />
 <CompilerVisibleProperty Include="IsMergedTestRunnerAssembly" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@
 <PropertyGroup>
 <!-- Needed for JitOptimizationSensitive -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <PropertyGroup>
 <NoStandardLib>True</NoStandardLib>
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_72845/Runtime_72845.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
 <Optimize>True</Optimize>
 <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
 <GCStressIncompatible>True</GCStressIncompatible>

 <!-- Not even printf is AOT compatible in F# -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="Runtime_72845.fs" />
Expand Down

3 changes: 3 additions & 0 deletions
src/tests/Regressions/coreclr/GitHub_22888/test22888.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@
 <!-- Needed for GC.WaitForPendingFinalizers -->
 <RequiresProcessIsolation>true</RequiresProcessIsolation>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

 <!-- Uses AssemblyLoadContext -->
 <NativeAotIncompatible>true</NativeAotIncompatible>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="test22888.cs" />
Expand Down

49 changes: 49 additions & 0 deletions
src/tests/issues.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,6 +682,15 @@

 <!-- NativeAOT specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)JIT/Methodical/tailcall_v4/hijacking/**">
 <Issue>needs triage</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/reflection/Modifiers/modifiers/**">
 <Issue>https://github.com/dotnet/runtime/issues/91381</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
 <Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
 </ExcludeList>
Expand DownExpand Up@@ -1151,6 +1160,46 @@
 </ExcludeList>
 </ItemGroup>

 <!-- NativeAOT x86 specific -->
 <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_d/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_r/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray2_cs_ro/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/doublearray/dblarray3_cs_do/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/perf/doublealign/Arrays/**">
 <Issue>https://github.com/dotnet/runtime/issues/101284</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Interop/COM/ComWrappers/API/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/IL/Tailcall/ExplicitTailCallNoSO/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/tailcall/tailcall/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/InlineArray/InlineArrayValid/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
 <Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
 </ExcludeList>
 <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
 <Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
 </ExcludeList>
 </ItemGroup>

 <!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
 Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
 and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->
Expand Down