Skip to content

Commit cdbc59a

Browse files
dudikeletidudikeleti
committed
Revert "Do not skip on .net8 x86"
This reverts commit b7586c6.
1 parent 2ef4c58 commit cdbc59a

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

‎tracer/test/Datadog.Trace.Debugger.IntegrationTests/DebuggerManagerDynamicTests.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ public DebuggerManagerDynamicTests(ITestOutputHelper output)
5050
[Trait("Category", "LinuxUnsupported")]
5151
public async Task DebuggerManager_DynamicInstrumentation_StartDisabled_EnabledViaRemoteConfig()
5252
{
53+
#if NET8_0_OR_GREATER
54+
// These tests often hang on x86 on .NET 8+. Needs investigation
55+
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
56+
#endif
57+
5358
// Set it true so we won't go through path of no debugger products at all
5459
SetEnvironmentVariable(ConfigurationKeys.Debugger.CodeOriginForSpansEnabled, "true");
5560
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
@@ -79,6 +84,9 @@ await RunDynamicConfigurationTest(
7984
[Trait("Category", "LinuxUnsupported")]
8085
public async Task DebuggerManager_ExceptionReplay_StartDisabled_EnabledViaRemoteConfig()
8186
{
87+
#if NET8_0_OR_GREATER
88+
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
89+
#endif
8290
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
8391

8492
await RunDynamicConfigurationTest(
@@ -99,6 +107,10 @@ await RunDynamicConfigurationTest(
99107
[Trait("Category", "LinuxUnsupported")]
100108
public async Task DebuggerManager_CodeOrigin_StartDisabled_EnabledViaRemoteConfig()
101109
{
110+
#if NET8_0_OR_GREATER
111+
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
112+
#endif
113+
102114
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
103115

104116
await RunDynamicConfigurationTest(
@@ -119,6 +131,9 @@ await RunDynamicConfigurationTest(
119131
[Trait("Category", "LinuxUnsupported")]
120132
public async Task DebuggerManager_MultipleProducts_StartDisabled_EnabledViaRemoteConfig()
121133
{
134+
#if NET8_0_OR_GREATER
135+
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
136+
#endif
122137
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
123138

124139
await RunDynamicConfigurationTest(
@@ -159,6 +174,10 @@ await RunDynamicConfigurationTest(
159174
[Trait("Category", "LinuxUnsupported")]
160175
public async Task DebuggerManager_DynamicInstrumentation_StartEnabled_DisabledViaRemoteConfig()
161176
{
177+
#if NET8_0_OR_GREATER
178+
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
179+
#endif
180+
162181
// Start with DI enabled via environment variable
163182
SetEnvironmentVariable(ConfigurationKeys.Debugger.DynamicInstrumentationEnabled, "true");
164183
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
@@ -190,6 +209,9 @@ await RunDynamicConfigurationTest(
190209
[Trait("Category", "LinuxUnsupported")]
191210
public async Task DebuggerManager_ExceptionReplay_StartEnabled_DisabledViaRemoteConfig()
192211
{
212+
#if NET8_0_OR_GREATER
213+
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
214+
#endif
193215
// Start with Exception Replay enabled via environment variable
194216
SetEnvironmentVariable(ConfigurationKeys.Debugger.ExceptionReplayEnabled, "true");
195217
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
@@ -212,6 +234,10 @@ await RunDynamicConfigurationTest(
212234
[Trait("Category", "LinuxUnsupported")]
213235
public async Task DebuggerManager_CodeOrigin_StartEnabled_DisabledViaRemoteConfig()
214236
{
237+
#if NET8_0_OR_GREATER
238+
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
239+
#endif
240+
215241
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
216242
SetEnvironmentVariable(ConfigurationKeys.Debugger.CodeOriginForSpansEnabled, "true");
217243

‎tracer/test/Datadog.Trace.Debugger.IntegrationTests/DebuggerManagerTests.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public DebuggerManagerTests(ITestOutputHelper output)
4646
public async Task DebuggerManager_AllFeaturesByDefault_NoDebuggerObjectsCreated()
4747
{
4848
#if NET8_0_OR_GREATER
49-
5049
// These tests often hang on x86 on .NET 8+. Needs investigation
5150
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
5251
#endif
@@ -69,6 +68,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
6968
public async Task DebuggerManager_DynamicInstrumentationExplicitlyDisabled_NoDebuggerObjectsCreated()
7069
{
7170
#if NET8_0_OR_GREATER
71+
// These tests often hang on x86 on .NET 8+. Needs investigation
7272
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
7373
#endif
7474
// at least one product should be enabled to initialize the debugger manager
@@ -90,6 +90,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
9090
public async Task DebuggerManager_ExceptionReplayExplicitlyDisabled_NoExceptionReplayObjectsCreated()
9191
{
9292
#if NET8_0_OR_GREATER
93+
// These tests often hang on x86 on .NET 8+. Needs investigation
9394
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
9495
#endif
9596
// at least one product should be enabled to initialize the debugger manager
@@ -109,6 +110,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
109110
public async Task DebuggerManager_CodeOriginExplicitlyDisabled_NoCodeOriginObjectsCreated()
110111
{
111112
#if NET8_0_OR_GREATER
113+
// These tests often hang on x86 on .NET 8+. Needs investigation
112114
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
113115
#endif
114116
// at least one product should be enabled to initialize the debugger manager
@@ -128,6 +130,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
128130
public async Task DebuggerManager_SymbolDatabaseUploadDisabled_NoSymbolUploaderCreated()
129131
{
130132
#if NET8_0_OR_GREATER
133+
// These tests often hang on x86 on .NET 8+. Needs investigation
131134
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
132135
#endif
133136
// at least one product should be enabled to initialize the debugger manager
@@ -149,6 +152,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
149152
public async Task DebuggerManager_DynamicInstrumentationEnabled_WithoutRemoteConfig_LogsWarning()
150153
{
151154
#if NET8_0_OR_GREATER
155+
// These tests often hang on x86 on .NET 8+. Needs investigation
152156
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
153157
#endif
154158
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "false");
@@ -164,6 +168,7 @@ public async Task DebuggerManager_DynamicInstrumentationEnabled_WithoutRemoteCon
164168
public async Task DebuggerManager_DynamicInstrumentationEnabled_WitRemoteConfig_CreateDynamicInstrumentationObjects()
165169
{
166170
#if NET8_0_OR_GREATER
171+
// These tests often hang on x86 on .NET 8+. Needs investigation
167172
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
168173
#endif
169174
SetEnvironmentVariable(ConfigurationKeys.Rcm.RemoteConfigurationEnabled, "true");
@@ -182,6 +187,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
182187
public async Task DebuggerManager_ExceptionReplayEnabled_CreatesExceptionReplayObjects()
183188
{
184189
#if NET8_0_OR_GREATER
190+
// These tests often hang on x86 on .NET 8+. Needs investigation
185191
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
186192
#endif
187193
SetEnvironmentVariable(ConfigurationKeys.Debugger.ExceptionReplayEnabled, "true");
@@ -199,6 +205,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
199205
public async Task DebuggerManager_CodeOriginEnabled_CreatesCodeOriginObjects()
200206
{
201207
#if NET8_0_OR_GREATER
208+
// These tests often hang on x86 on .NET 8+. Needs investigation
202209
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
203210
#endif
204211
SetEnvironmentVariable(ConfigurationKeys.Debugger.CodeOriginForSpansEnabled, "true");
@@ -216,6 +223,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
216223
public async Task DebuggerManager_MultipleFeaturesCombined_CreatesAppropriateObjects()
217224
{
218225
#if NET8_0_OR_GREATER
226+
// These tests often hang on x86 on .NET 8+. Needs investigation
219227
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
220228
#endif
221229
SetEnvironmentVariable(ConfigurationKeys.Debugger.ExceptionReplayEnabled, "true");
@@ -240,6 +248,7 @@ await RunDebuggerManagerTestWithMemoryAssertions(memoryAssertions =>
240248
public async Task DebuggerManager_StartupDiagnosticLogEnabled_WritesConfigurationLog()
241249
{
242250
#if NET8_0_OR_GREATER
251+
// These tests often hang on x86 on .NET 8+. Needs investigation
243252
Skip.If(!EnvironmentTools.IsTestTarget64BitProcess());
244253
#endif
245254
SetEnvironmentVariable(ConfigurationKeys.StartupDiagnosticLogEnabled, "true");

0 commit comments

Comments
 (0)