Skip to content

Add module to support Pester tests for automating debugger commands (stepInto, stepOut, etc.), along with basic tests #9825

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
daxian-dbw merged 7 commits into from
Jun 13, 2019
Merged

Add module to support Pester tests for automating debugger commands (stepInto, stepOut, etc.), along with basic tests #9825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
395a448
add HelpersDebugger module and debugger tests
KirkMunro Jun 4, 2019
ab7d636
additional Pester tests; fixed debugger bugs
KirkMunro Jun 4, 2019
1a84038
make variable names in tests easier to understand
KirkMunro Jun 5, 2019
7d7766d
put disable debugger back with new conditions
KirkMunro Jun 5, 2019
0580771
Codacy update
KirkMunro Jun 5, 2019
4aafbb3
refactor disable debugger test into property
KirkMunro Jun 5, 2019
14d5f11
update based on PR feedback
KirkMunro Jun 12, 2019
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
19 changes: 15 additions & 4 deletions src/System.Management.Automation/engine/debugger/debugger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,9 +1237,8 @@ internal void RemoveBreakpoint(Breakpoint breakpoint)

breakpoint.RemoveSelf(this);

if (_idToBreakpoint.Count == 0)
if (CanDisableDebugger)
{
// The last breakpoint was removed, turn off debugging.
SetInternalDebugMode(InternalDebugMode.Disabled);
}

Expand Down Expand Up @@ -2099,6 +2098,19 @@ private bool CanEnableDebugger
}
}

private bool CanDisableDebugger
{
get
{
// The debugger can be disbled if there are no breakpoints
// left and if we are not currently stepping in the debugger.
return _idToBreakpoint.Count == 0 &&
_currentDebuggerAction != DebuggerResumeAction.StepInto &&
_currentDebuggerAction != DebuggerResumeAction.StepOver &&
_currentDebuggerAction != DebuggerResumeAction.StepOut;
}
}

private static bool IsSystemLockedDown
{
get
Expand Down Expand Up @@ -3857,9 +3869,8 @@ internal void DisableTracing()
_context.IgnoreScriptDebug = _savedIgnoreScriptDebug;
_context.PSDebugTraceLevel = 0;
_context.PSDebugTraceStep = false;
if (!_idToBreakpoint.Any())
if (CanDisableDebugger)
{
// Only disable debug mode if there are no breakpoints.
SetInternalDebugMode(InternalDebugMode.Disabled);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/lang/scriptblock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static ScriptBlock Create(string script) => Create(
fileContents: script);

internal static ScriptBlock CreateDelayParsedScriptBlock(string script, bool isProductCode)
=> new ScriptBlock(new CompiledScriptBlockData(script, isProductCode));
=> new ScriptBlock(new CompiledScriptBlockData(script, isProductCode)) { DebuggerHidden = true };

/// <summary>
/// Returns a new scriptblock bound to a module. Any local variables in the
Expand Down
Loading