Skip to content
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

Jump to bottom

Run CallTargetNativeTests on Windows #5754

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Run CallTargetNativeTests on Windows #5754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db4c431
Run CallTargetNativeTests on Windows
andrewlock Jul 1, 2024
0bf98de
Add /force flag to the corflag command to make it compatible with Cal…
tonyredondo Sep 30, 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
2 changes: 2 additions & 0 deletions tracer/build/_build/Build.Steps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1453,6 +1453,7 @@ _ when path.Contains("dependency-libs") => false,
{
// This does some "unnecessary" rebuilding and restoring
var includeIntegration = TracerDirectory.GlobFiles("test/test-applications/integrations/**/*.csproj");
var includeInstrumentation = TracerDirectory.GlobFiles("test/test-applications/instrumentation/**/*.csproj");
// Don't build aspnet full framework sample in this step
var includeSecurity = TracerDirectory.GlobFiles("test/test-applications/security/*/*.csproj");

Expand All @@ -1461,6 +1462,7 @@ _ when path.Contains("dependency-libs") => false,
.Concat(TracerDirectory.GlobFiles("test/test-applications/integrations/Samples.AzureServiceBus/*.csproj"));

var projects = includeIntegration
.Concat(includeInstrumentation)
.Concat(includeSecurity)
.Select(x => Solution.GetProject(x))
.Where(project =>
Expand Down
10 changes: 10 additions & 0 deletions tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CallTargetNativeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static IEnumerable<object[]> MethodArgumentsData()
[SkippableTheory]
[MemberData(nameof(MethodArgumentsData))]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task MethodArgumentsInstrumentation(int numberOfArguments, bool fastPath)
{
SetInstrumentationVerification();
Expand Down Expand Up @@ -86,6 +87,7 @@ public async Task MethodArgumentsInstrumentation(int numberOfArguments, bool fas

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task MethodRefArguments()
{
SetInstrumentationVerification();
Expand Down Expand Up @@ -117,6 +119,7 @@ public async Task MethodRefArguments()

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task MethodOutArguments()
{
SetInstrumentationVerification();
Expand Down Expand Up @@ -147,6 +150,7 @@ public async Task MethodOutArguments()

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task MethodAbstract()
{
SetInstrumentationVerification();
Expand Down Expand Up @@ -177,6 +181,7 @@ public async Task MethodAbstract()
}

[SkippableFact]
[Trait("RunOnWindows", "True")]
public async Task MethodInterface()
{
int agentPort = TcpPortProvider.GetOpenPort();
Expand Down Expand Up @@ -205,6 +210,7 @@ public async Task MethodInterface()

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task RemoveIntegrations()
{
SetInstrumentationVerification();
Expand All @@ -228,6 +234,7 @@ public async Task RemoveIntegrations()

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task ExtraIntegrations()
{
SetInstrumentationVerification();
Expand All @@ -248,6 +255,7 @@ public async Task ExtraIntegrations()

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task CallTargetBubbleUpExceptionIntegrations()
{
SetInstrumentationVerification();
Expand All @@ -262,6 +270,7 @@ public async Task CallTargetBubbleUpExceptionIntegrations()

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task CategorizedCallTargetIntegrations()
{
SetInstrumentationVerification();
Expand All @@ -283,6 +292,7 @@ public async Task CategorizedCallTargetIntegrations()

[SkippableFact]
[Trait("SupportsInstrumentationVerification", "True")]
[Trait("RunOnWindows", "True")]
public async Task MethodRefStructArguments()
{
SetInstrumentationVerification();
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.TestHelpers/ProfilerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static void SetCorFlags(string executable, ITestOutputHelper output, bool
}

output?.WriteLine($"Updating {Path.GetFileName(executable)} using {setBit}");
var opts = new ProcessStartInfo(corFlagsExe, $"\"{executable}\" {setBit}")
var opts = new ProcessStartInfo(corFlagsExe, $"\"{executable}\" {setBit} /force")
{
CreateNoWindow = true,
UseShellExecute = false
Expand Down
Loading