Skip to content

Merge debugger tests Windows. #6987

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.

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 23 additions & 2 deletions .azure-pipelines/ultimate-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1728,8 +1728,29 @@ stages:

- template: steps/restore-working-directory.yml

- script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType $(debugType) --Optimize $(optimize) --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Run integration tests
- script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType portable --Optimize true --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Run integration tests Portable Optimize(true)
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
Filter: $(IntegrationTestFilter)
SampleName: $(IntegrationTestSampleName)

- script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType portable --Optimize false --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Run integration tests Portable Optimize(false)
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
Filter: $(IntegrationTestFilter)
SampleName: $(IntegrationTestSampleName)

- script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType full --Optimize true --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Run integration tests Full Optimize(true)
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
Filter: $(IntegrationTestFilter)
SampleName: $(IntegrationTestSampleName)

- script: tracer\build.cmd BuildAndRunDebuggerIntegrationTests -Framework $(framework) --TargetPlatform $(targetPlatform) --DebugType full --Optimize false --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Run integration tests Full Optimize(false)
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
Filter: $(IntegrationTestFilter)
Expand Down
21 changes: 6 additions & 15 deletions tracer/build/_build/Build.VariableGenerations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,21 +179,12 @@ void GenerateIntegrationTestsDebuggerWindowsMatrix()
// fails on CI with error "apphost.exe" not found.
continue;
}

foreach (var debugType in debugTypes)
{
foreach (var optimize in optimizations)
{
matrix.Add($"{targetPlatform}_{framework}_{debugType}_{optimize}",
new
{
framework = framework,
targetPlatform = targetPlatform,
debugType = debugType,
optimize = optimize
});
}
}
matrix.Add($"{targetPlatform}_{framework}",
new
{
framework = framework,
targetPlatform = targetPlatform,
});
}
}

Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/Debugger/LiveDebugger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public async Task InitializeAsync()

try
{
Log.Information("Live Debugger initialization started");
Log.Information("Live Debugger initialization started.");
_subscriptionManager.SubscribeToChanges(_subscription);

DebuggerSnapshotSerializer.SetConfig(Settings);
Expand Down
Loading