Skip to content

Commit 268bf7d

Browse files
mdh1418mdh1418
committed
Try to get linux arm coreclr lanes passing
1 parent 94ebb0f commit 268bf7d

File tree

16 files changed

+63
-7
lines changed

16 files changed

+63
-7
lines changed

‎src/tests/Directory.Build.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,5 @@
194194
<TestFramework>GeneratedRunner</TestFramework>
195195
</PropertyGroup>
196196

197-
<PropertyGroup>
198-
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
199-
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
200-
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
201-
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
202-
</PropertyGroup>
203-
204197
<Import Project="$(RepositoryEngineeringDir)testing\tests.props" Condition="'$(IsTestsCommonProject)' != 'true'" />
205198
</Project>

‎src/tests/JIT/Directed/debugging/debuginfo/tester.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public static unsafe int Main()
2828
ClrTraceEventParser.Keywords.Jit | ClrTraceEventParser.Keywords.JittedMethodILToNativeMap;
2929

3030
#if UPDATED_NETCORE_CLIENT
31+
Console.WriteLine($"NONLEGACY NETCORE.CLIENT");
3132
var dotnetRuntimeProvider = new List<EventPipeProvider>
3233
{
3334
new EventPipeProvider("Microsoft-Windows-DotNETRuntime", eventLevel: EventLevel.Verbose, keywords: (long)keywords)
@@ -41,6 +42,7 @@ public static unsafe int Main()
4142
1024,
4243
ValidateMappings);
4344
#else
45+
Console.WriteLine($"LEGACY TOOLS.RUNTIMECLIENT");
4446
var dotnetRuntimeProvider = new List<Provider>
4547
{
4648
new Provider("Microsoft-Windows-DotNETRuntime", eventLevel: EventLevel.Verbose, keywords: (ulong)keywords)

‎src/tests/JIT/Directed/debugging/debuginfo/tester.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
88
<GCStressIncompatible>true</GCStressIncompatible>
99
</PropertyGroup>
10+
<PropertyGroup>
11+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
12+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
13+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
14+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
15+
</PropertyGroup>
1016
<ItemGroup>
1117
<ProjectReference Include="tests_d.ilproj" Aliases="tests_d" />
1218
<ProjectReference Include="tests_r.ilproj" Aliases="tests_r" />

‎src/tests/tracing/eventpipe/bigevent/bigevent.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,15 @@ public static int Main(string[] args)
5050
// This test tries to send a big event (>100KB) and checks that the app does not crash
5151
// See https://github.com/dotnet/runtime/issues/50515 for the regression issue
5252
#if (UPDATED_NETCORE_CLIENT == true)
53+
Console.WriteLine($"NONLEGACY NETCORE.CLIENT");
5354
var providers = new List<EventPipeProvider>()
5455
{
5556
new EventPipeProvider("BigEventSource", EventLevel.Verbose)
5657
};
5758

5859
return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _Verify);
5960
#else
61+
Console.WriteLine($"LEGACY TOOLS.RUNTIMECLIENT");
6062
var providers = new List<Provider>()
6163
{
6264
new Provider("BigEventSource")

‎src/tests/tracing/eventpipe/bigevent/bigevent.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
<!-- GCStress timeout: https://github.com/dotnet/runtime/issues/51133 -->
99
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">true</GCStressIncompatible>
1010
</PropertyGroup>
11+
<PropertyGroup>
12+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
13+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
14+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
15+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
16+
</PropertyGroup>
1117
<ItemGroup>
1218
<Compile Include="$(MSBuildProjectName).cs" />
1319
<ProjectReference Include="../common/common.csproj" />

‎src/tests/tracing/eventpipe/buffersize/buffersize.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public static int Main(string[] args)
3232
// This tests the resilience of message sending with
3333
// smaller buffers, specifically 1MB and 4MB
3434
#if (UPDATED_NETCORE_CLIENT == true)
35+
Console.WriteLine($"NONLEGACY NETCORE.CLIENT");
3536
var providers = new List<EventPipeProvider>()
3637
{
3738
new EventPipeProvider("MyEventSource", EventLevel.Verbose)
@@ -49,6 +50,7 @@ public static int Main(string[] args)
4950

5051
return 100;
5152
#else
53+
Console.WriteLine($"LEGACY TOOLS.RUNTIMECLIENT");
5254
var providers = new List<Provider>()
5355
{
5456
new Provider("MyEventSource")

‎src/tests/tracing/eventpipe/buffersize/buffersize.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<JitOptimizationSensitive>true</JitOptimizationSensitive>
88
<GCStressIncompatible>true</GCStressIncompatible>
99
</PropertyGroup>
10+
<PropertyGroup>
11+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
12+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
13+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
14+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
15+
</PropertyGroup>
1016
<ItemGroup>
1117
<Compile Include="$(MSBuildProjectName).cs" />
1218
<ProjectReference Include="../common/common.csproj" />

‎src/tests/tracing/eventpipe/common/common.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
<NoWarn>CS1591,CS8073,CS0162</NoWarn>
1313
</PropertyGroup>
1414

15+
<PropertyGroup>
16+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
17+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
18+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
19+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
20+
</PropertyGroup>
21+
1522
<ItemGroup>
1623
<Compile Condition="'$(UseUpdatedNETCoreClient)' == 'true'" Include="IpcTraceTest.cs" />
1724
<Compile Condition="'$(UseUpdatedNETCoreClient)' != 'true'" Include="IpcTraceTest.legacy.cs" />

‎src/tests/tracing/eventpipe/eventsourceerror/eventsourceerror.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,15 @@ public static int Main(string[] args)
5353
// This test validates that if an EventSource generates an error
5454
// during construction it gets emitted over EventPipe
5555
#if (UPDATED_NETCORE_CLIENT == true)
56+
Console.WriteLine($"NONLEGACY NETCORE.CLIENT");
5657
var providers = new List<EventPipeProvider>
5758
{
5859
new EventPipeProvider("IllegalTypesEventSource", EventLevel.Verbose)
5960
};
6061

6162
return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesRundownContainMethodEvents);
6263
#else
64+
Console.WriteLine($"LEGACY TOOLS.RUNTIMECLIENT");
6365
List<Provider> providers = new List<Provider>
6466
{
6567
new Provider("IllegalTypesEventSource")

‎src/tests/tracing/eventpipe/eventsourceerror/eventsourceerror.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<GCStressIncompatible>true</GCStressIncompatible>
88
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
99
</PropertyGroup>
10+
<PropertyGroup>
11+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
12+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
13+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
14+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
15+
</PropertyGroup>
1016
<ItemGroup>
1117
<Compile Include="$(MSBuildProjectName).cs" />
1218
<ProjectReference Include="../common/common.csproj" />

‎src/tests/tracing/eventpipe/gcdump/gcdump.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ public static int Main(string[] args)
3636
// This test validates that if an EventSource generates an error
3737
// during construction it gets emitted over EventPipe
3838
#if (UPDATED_NETCORE_CLIENT == true)
39+
Console.WriteLine($"NONLEGACY NETCORE.CLIENT");
3940
List<EventPipeProvider> providers = new List<EventPipeProvider>
4041
{
4142
new EventPipeProvider("Microsoft-Windows-DotNETRuntime", eventLevel: EventLevel.Verbose, keywords: (long)ClrTraceEventParser.Keywords.GCHeapSnapshot)
4243
};
4344

4445
return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesRundownContainMethodEvents);
4546
#else
47+
Console.WriteLine($"LEGACY TOOLS.RUNTIMECLIENT");
4648
List<Provider> providers = new List<Provider>
4749
{
4850
new Provider("Microsoft-Windows-DotNETRuntime", eventLevel: EventLevel.Verbose, keywords: (ulong)ClrTraceEventParser.Keywords.GCHeapSnapshot)

‎src/tests/tracing/eventpipe/gcdump/gcdump.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<!-- This test provides no interesting scenarios for GCStress -->
88
<GCStressIncompatible>true</GCStressIncompatible>
99
</PropertyGroup>
10+
<PropertyGroup>
11+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
12+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
13+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
14+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
15+
</PropertyGroup>
1016
<ItemGroup>
1117
<Compile Include="$(MSBuildProjectName).cs" />
1218
<ProjectReference Include="../common/common.csproj" />

‎src/tests/tracing/eventpipe/providervalidation/providervalidation.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public static int Main(string[] args)
3333
// and that providers turned on that generate events are being written to
3434
// the stream.
3535
#if (UPDATED_NETCORE_CLIENT == true)
36+
Console.WriteLine($"NONLEGACY NETCORE.CLIENT");
3637
var providers = new List<EventPipeProvider>()
3738
{
3839
new EventPipeProvider("MyEventSource", EventLevel.Verbose),
@@ -41,6 +42,7 @@ public static int Main(string[] args)
4142

4243
var ret = IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024);
4344
#else
45+
Console.WriteLine($"LEGACY TOOLS.RUNTIMECLIENT");
4446
var providers = new List<Provider>()
4547
{
4648
new Provider("MyEventSource"),

‎src/tests/tracing/eventpipe/providervalidation/providervalidation.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<JitOptimizationSensitive>true</JitOptimizationSensitive>
88
<GCStressIncompatible>true</GCStressIncompatible>
99
</PropertyGroup>
10+
<PropertyGroup>
11+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
12+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
13+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
14+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
15+
</PropertyGroup>
1016
<ItemGroup>
1117
<Compile Include="$(MSBuildProjectName).cs" />
1218
<ProjectReference Include="../common/common.csproj" />

‎src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ public static int Main(string[] args)
2828
// and that the rundown contains the necessary events to get
2929
// symbols in a nettrace file.
3030
#if (UPDATED_NETCORE_CLIENT == true)
31+
Console.WriteLine($"NONLEGACY NETCORE.CLIENT");
3132
var providers = new List<EventPipeProvider>()
3233
{
3334
new EventPipeProvider("Microsoft-DotNETCore-SampleProfiler", EventLevel.Verbose)
3435
};
3536

3637
return IpcTraceTest.RunAndValidateEventCounts(_expectedEventCounts, _eventGeneratingAction, providers, 1024, _DoesRundownContainMethodEvents);
3738
#else
39+
Console.WriteLine($"LEGACY TOOLS.RUNTIMECLIENT");
3840
var providers = new List<Provider>()
3941
{
4042
new Provider("Microsoft-DotNETCore-SampleProfiler")

‎src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
<!-- Times out -->
1313
<GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">true</GCStressIncompatible>
1414
</PropertyGroup>
15+
<PropertyGroup>
16+
<!-- On Linux arm coreclr, the updated tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj project
17+
does not yet work for several eventpipe runtime tests. We segment those tests with the following property and symbol -->
18+
<UseUpdatedNETCoreClient Condition="!('$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'arm' And '$(RuntimeFlavor)' == 'coreclr')">true</UseUpdatedNETCoreClient>
19+
<DefineConstants Condition="'$(UseUpdatedNETCoreClient)' == 'true'">$(DefineConstants);UPDATED_NETCORE_CLIENT</DefineConstants>
20+
</PropertyGroup>
1521

1622
<ItemGroup>
1723
<Compile Include="$(MSBuildProjectName).cs" />

0 commit comments

Comments
 (0)