diff options
author | Thays Grazia <thaystg@gmail.com> | 2019-02-12 19:20:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 19:20:38 +0300 |
commit | 5f65ce9f7dfa6404219c90b6b82ba586fabb2e1c (patch) | |
tree | 2a2319c795bba8e42694a2f3bee9316b73169319 /mcs/class/Mono.Debugger.Soft | |
parent | 2b9e5db15333a6618d911c0afc5238deb28c7b0a (diff) |
[debugger] Reverting part of https://github.com/mono/mono/pull/12114 (#12950)
* [debugger] Reverting part of this commit https://github.com/mono/mono/pull/12114, removing this part the test ShouldCorrectlyStepOverOnExitFromArgsAfterStepInMethodParameter continues working and solve the regressions of 12881.
Inserted a new test that reproduces the regression.
Fixes #12881
Diffstat (limited to 'mcs/class/Mono.Debugger.Soft')
-rw-r--r-- | mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs | 16 | ||||
-rw-r--r-- | mcs/class/Mono.Debugger.Soft/Test/dtest.cs | 18 |
2 files changed, 34 insertions, 0 deletions
diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs index 031080caff3..f376840fbb4 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs @@ -489,9 +489,25 @@ public class Tests : TestsBase, ITest2 elapsed_time(); field_with_unsafe_cast_value(); inspect_enumerator_in_generic_struct(); + if_property_stepping(); return 3; } + private class TestClass { + private string oneLineProperty = ""; + public string OneLineProperty { + get { return oneLineProperty; } + set { oneLineProperty = value; } + } + } + + public static void if_property_stepping() { + var test = new TestClass(); + if (test.OneLineProperty == "someInvalidValue6049e709-7271-41a1-bc0a-f1f1b80d4125") + return; + Console.Write(""); + } + public static void local_reflect () { //Breakpoint line below, and reflect someField via ObjectMirror; LocalReflectClass.RunMe (); diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs index e97dd8f3400..b0c0de5c832 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs @@ -4828,5 +4828,23 @@ public class DebuggerTests AssertValue ("abc", variable); } + [Test] + public void IfPropertyStepping () { + Event e = run_until ("if_property_stepping"); + var req = create_step (e); + req.Enable (); + e = step_once (); + e = step_over (); + e = step_into (); + e = step_into (); + e = step_into (); + e = step_into (); + e = step_into (); + e = step_into (); + e = step_into (); + e = step_into (); + e = step_into (); + Assert.IsTrue ((e as StepEvent).Method.Name == "op_Equality" || (e as StepEvent).Method.Name == "if_property_stepping"); + } } // class DebuggerTests } // namespace |