diff --git a/src/mono/wasi/Makefile b/src/mono/wasi/Makefile index 2905f09f803c7d..9cd33abfa2f003 100644 --- a/src/mono/wasi/Makefile +++ b/src/mono/wasi/Makefile @@ -104,9 +104,9 @@ submit-tests-helix: run-debugger-tests: rm -f $(TOP)/artifacts/bin/DebuggerTestSuite/x64/Debug/*log; \ if [ ! -z "$(TEST_FILTER)" ]; then \ - $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "Category!=failing&FullyQualifiedName$(TEST_FILTER)" $(TEST_ARGS); \ + $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing&FullyQualifiedName$(TEST_FILTER)" $(TEST_ARGS); \ else \ - $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "Category!=failing" $(TEST_ARGS); \ + $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing" $(TEST_ARGS); \ fi build-dbg-proxy: diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile index 0968e482f52f85..263838a0a7abd9 100644 --- a/src/mono/wasm/Makefile +++ b/src/mono/wasm/Makefile @@ -148,9 +148,9 @@ submit-tests-helix: run-debugger-tests: rm -f $(TOP)/artifacts/bin/DebuggerTestSuite/x64/Debug/*log; \ if [ ! -z "$(TEST_FILTER)" ]; then \ - $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "Category!=failing&FullyQualifiedName$(TEST_FILTER)" $(TEST_ARGS); \ + $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing&FullyQualifiedName$(TEST_FILTER)" $(TEST_ARGS); \ else \ - $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "Category!=failing" $(TEST_ARGS); \ + $(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(MSBUILD_ARGS) "-l:trx;LogFileName=DebuggerTestsResults.xml" --results-directory $(TOP)/artifacts/log/$(CONFIG) --filter "category!=failing" $(TEST_ARGS); \ fi build-dbg-proxy: diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs index ea2fc12f67e084..76b75c452e4d8d 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/AssignmentTests.cs @@ -50,6 +50,7 @@ public AssignmentTests(ITestOutputHelper testOutput) [ConditionalTheory(nameof(RunningOnChrome))] [MemberData("GetTestData")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task InspectVariableBeforeAndAfterAssignment(string clazz, JObject checkDefault, JObject checkValue, string methodName) { await SetBreakpointInMethod("debugger-test", "DebuggerTests." + clazz, "Prepare", 2); diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/AsyncTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/AsyncTests.cs index ec2aa8a200f9cf..0711883eab4e85 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/AsyncTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/AsyncTests.cs @@ -44,6 +44,7 @@ public async Task AsyncLocalsInContinueWith(string method_name, string expected_ }); [ConditionalFact(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task AsyncLocalsInContinueWithInstanceUsingThisBlock() => await CheckInspectLocalsAtBreakpointSite( "DebuggerTests.AsyncTests.ContinueWithTests", "ContinueWithInstanceUsingThisAsync", 5, "DebuggerTests.AsyncTests.ContinueWithTests.ContinueWithInstanceUsingThisAsync.AnonymousMethod__6_0", "window.setTimeout(function() { invoke_static_method('[debugger-test] DebuggerTests.AsyncTests.ContinueWithTests:RunAsync'); })", @@ -66,6 +67,7 @@ public async Task AsyncLocalsInContinueWithInstanceUsingThisBlock() => await Che }); [Fact] // NestedContinueWith + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task AsyncLocalsInNestedContinueWithStaticBlock() => await CheckInspectLocalsAtBreakpointSite( "DebuggerTests.AsyncTests.ContinueWithTests", "NestedContinueWithStaticAsync", 5, "DebuggerTests.AsyncTests.ContinueWithTests.NestedContinueWithStaticAsync", "window.setTimeout(function() { invoke_static_method('[debugger-test] DebuggerTests.AsyncTests.ContinueWithTests:RunAsync'); })", @@ -140,7 +142,6 @@ await StepAndCheck(StepKind.Resume, source_to_pause, line2, col2, func_to_pause, public async Task InspectLocalsInAsyncVBMethod() { var expression = $"{{ invoke_static_method('[debugger-test-vb] DebuggerTestVB.TestVbScope:Run'); }}"; - await EvaluateAndCheck( "window.setTimeout(function() {" + expression + "; }, 1);", "dotnet://debugger-test-vb.dll/debugger-test-vb.vb", 14, 12, diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs index adb1e04d8a7f83..f251ceb78b2296 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/BreakpointTests.cs @@ -217,6 +217,7 @@ await EvaluateAndCheck( [MemberData(nameof(FalseConditions))] [MemberData(nameof(TrueConditions))] [MemberData(nameof(InvalidConditions))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task ConditionalBreakpoint2(string function_to_call, string method_to_stop, string condition, bool bp_stop_expected) { Result [] bps = new Result[2]; @@ -699,6 +700,7 @@ public async Task StepThroughOrNonUserCodeAttributeResumeWithBp(bool justMyCodeE [InlineData(true, "Debugger.stepInto", "RunStepThroughWithNonUserCode", "RunStepThroughWithNonUserCode", -1, 8, "RunStepThroughWithNonUserCode", -1, 4)] [InlineData(false, "Debugger.resume", "RunStepThroughWithNonUserCode", "StepThroughWithNonUserCodeUserBp", 927, 8, "RunStepThroughWithNonUserCode", -1, 4)] [InlineData(true, "Debugger.resume", "RunStepThroughWithNonUserCode", "RunStepThroughWithNonUserCode", -1, 8, "RunStepThroughWithNonUserCode", -1, 4)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task StepThroughOrNonUserCodeAttributeWithUserBp( bool justMyCodeEnabled, string debuggingFunction, string evalFunName, string functionNameCheck1, int line1, int col1, diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs index 1e87f9e60cc0bf..f03f0518e00205 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/GetPropertiesTests.cs @@ -260,6 +260,7 @@ public GetPropertiesTests(ITestOutputHelper testOutput) : base(testOutput) [MemberData(nameof(ClassGetPropertiesTestData), parameters: false)] [MemberData(nameof(StructGetPropertiesTestData), parameters: true)] [MemberData(nameof(StructGetPropertiesTestData), parameters: false)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task InspectTypeInheritedMembers(string type_name, bool? own_properties, bool? accessors_only, string[] expected_names, Dictionary all_props, bool is_async) => await InspectTypeInheritedMembersInternal(type_name, own_properties, accessors_only, expected_names, all_props, is_async, AutoEvaluate.Unset); diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/SetNextIpTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/SetNextIpTests.cs index f19f5a556a3cf8..d2cafa0886717e 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/SetNextIpTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/SetNextIpTests.cs @@ -113,6 +113,7 @@ await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-test.cs", } [ConditionalFact(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task Lambda() { var debugger_test_loc = "dotnet://debugger-test.dll/debugger-async-test.cs"; @@ -159,6 +160,7 @@ await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-async-tes } [ConditionalFact(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task Lambda_InvalidLocation() { var debugger_test_loc = "dotnet://debugger-test.dll/debugger-async-test.cs"; @@ -188,6 +190,7 @@ await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-async-tes } [ConditionalFact(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task Lambda_ToNestedLambda() { var debugger_test_loc = "dotnet://debugger-test.dll/debugger-async-test.cs"; @@ -206,7 +209,7 @@ public async Task Lambda_ToNestedLambda() await SetNextIPAndCheck(top_frame["scriptId"].Value(), "dotnet://debugger-test.dll/debugger-async-test.cs", 88, 20, "DebuggerTests.AsyncTests.ContinueWithTests.NestedContinueWithInstanceAsync", expected_error: true); - + await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-async-test.cs", 79, 16, "DebuggerTests.AsyncTests.ContinueWithTests.NestedContinueWithInstanceAsync", locals_fn: async (locals) => { @@ -218,6 +221,7 @@ await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-async-tes } [ConditionalFact(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task Lambda_ToNestedSingleLineLambda_Invalid() { var debugger_test_loc = "dotnet://debugger-test.dll/debugger-async-test.cs"; @@ -248,6 +252,7 @@ await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-async-tes } [ConditionalFact(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task Lambda_ToNestedSingleLineLambda_Valid() { var debugger_test_loc = "dotnet://debugger-test.dll/debugger-async-test.cs"; @@ -271,7 +276,7 @@ await SetNextIPAndCheck(top_frame["scriptId"].Value(), "dotnet://debugge await CheckValueType(locals, "code", "System.Threading.Tasks.TaskStatus", description: "Created"); await CheckValueType(locals, "dt0", "System.DateTime", description: "1/1/0001 12:00:00 AM"); }); - + await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-async-test.cs", 92, 12, "DebuggerTests.AsyncTests.ContinueWithTests.NestedContinueWithInstanceAsync", locals_fn: async (locals) => { diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs b/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs index e04639e8e420aa..19875081df6d64 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs +++ b/src/mono/wasm/debugger/DebuggerTestSuite/SteppingTests.cs @@ -702,8 +702,8 @@ await EvaluateAndCheck( await StepAndCheck(StepKind.Over, "dotnet://debugger-test.dll/debugger-async-step.cs", 15, 12, "MoveNext"); } - // [ConditionalFact(nameof(RunningOnChrome))] - //[ActiveIssue("https://github.com/dotnet/runtime/issues/42421")] + [ConditionalFact(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/42421")] public async Task StepOutOfAsyncMethod() { string source_file = "dotnet://debugger-test.dll/debugger-async-step.cs"; @@ -865,8 +865,8 @@ await EvaluateAndCheck( method_name); } - // [ConditionalTheory(nameof(RunningOnChrome))] - //[ActiveIssue("https://github.com/dotnet/runtime/issues/73867")] + [ConditionalTheory(nameof(RunningOnChrome))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/73867")] [InlineData(184, 20, 161, 8, "HiddenLinesContainingStartOfAnAsyncBlock")] [InlineData(206, 20, 201, 8, "HiddenLinesAtTheEndOfANestedAsyncBlockWithWithLineDefaultOutsideTheMethod")] [InlineData(224, 20, 220, 8, "HiddenLinesAtTheEndOfANestedAsyncBlockWithWithLineDefaultOutsideTheMethod2")] @@ -885,6 +885,7 @@ await EvaluateAndCheck( [InlineData(153, 20, 155, 16, "HiddenLinesAtTheEndOfANestedAsyncBlockWithNoLinesAtEndOfTheMethod.AnonymousMethod__1")] [InlineData(154, 20, 155, 16, "HiddenLinesAtTheEndOfANestedAsyncBlockWithNoLinesAtEndOfTheMethod.AnonymousMethod__1")] [InlineData(170, 20, 172, 16, "HiddenLinesAtTheEndOfANestedAsyncBlockWithBreakableLineAtEndOfTheMethod.AnonymousMethod__1")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task BreakpointOnHiddenLineShouldStopAtEarliestNextAvailableLineAsync(int line_bp, int column_bp, int line_pause, int column_pause, string method_name) { await SetBreakpoint("dotnet://debugger-test.dll/debugger-async-test.cs", line_bp, column_bp); @@ -1219,6 +1220,7 @@ await StepAndCheck(StepKind.Into, "dotnet://Newtonsoft.Json.dll/JArray.cs", 350, [ConditionalTheory(nameof(RunningOnChrome))] [InlineData(true)] [InlineData(false)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/86496", typeof(DebuggerTests), nameof(DebuggerTests.WasmMultiThreaded))] public async Task SkipWasmFunctionsAccordinglyJustMyCode(bool justMyCode) { await SetJustMyCode(justMyCode); diff --git a/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets b/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets index f51e059372c82e..f28c4436f13a5e 100644 --- a/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets +++ b/src/mono/wasm/debugger/Wasm.Debugger.Tests/wasm.helix.targets @@ -27,8 +27,8 @@ $(TestArchiveTestsDir)Wasm.Debugger.Tests.zip $(HelixCommand) $(_DebuggerTestsWorkItemTimeout) - set "TEST_ARGS=--filter FullyQualifiedName~%(Identity)" - export "TEST_ARGS=--filter FullyQualifiedName~%(Identity)" + set "TEST_ARGS=--filter category!=failing&FullyQualifiedName~%(Identity)" + export "TEST_ARGS=--filter category!=failing&FullyQualifiedName~%(Identity)"