From f984eb1bbb04862b8d48d9aac2d31d36ba5fbae5 Mon Sep 17 00:00:00 2001 From: Michael Starzinger Date: Thu, 10 Aug 2017 13:51:11 +0200 Subject: [PATCH] [test] Rebaseline inspector test. This changes the baseline of an inspector test setting breakpoints within an asm.js module while the module is being executed. With the validator it is not supported to switch from active WebAssembly code back to debuggable interpreter code. Hence some previously expected breakpoints no longer fire, the behavior is consistent across all configurations now though. R=yangguo@chromium.org TEST=inspector/debugger/asm-js-breakpoint-during-exec BUG=v8:6166 Change-Id: Ie1bb62fa6df28b10336b4cb5d381d2141eec356c Reviewed-on: https://chromium-review.googlesource.com/608977 Reviewed-by: Yang Guo Commit-Queue: Michael Starzinger Cr-Commit-Position: refs/heads/master@{#47301} --- ...asm-js-breakpoint-during-exec-expected.txt | 27 +++++-------------- test/inspector/inspector.status | 4 --- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/test/inspector/debugger/asm-js-breakpoint-during-exec-expected.txt b/test/inspector/debugger/asm-js-breakpoint-during-exec-expected.txt index 32c950d2bd..feb4a3be04 100644 --- a/test/inspector/debugger/asm-js-breakpoint-during-exec-expected.txt +++ b/test/inspector/debugger/asm-js-breakpoint-during-exec-expected.txt @@ -9,8 +9,8 @@ Running test: runTestFunction Script nr 2 parsed! Paused #1 - [0] {"functionName":"call_debugger","function_lineNumber":13,"function_columnNumber":24,"lineNumber":14,"columnNumber":4} - - [1] {"functionName":"callDebugger","function_lineNumber":4,"function_columnNumber":25,"lineNumber":5,"columnNumber":6} - - [2] {"functionName":"redirectFun","function_lineNumber":7,"function_columnNumber":24,"lineNumber":8,"columnNumber":6} + - [1] {"functionName":"callDebugger","lineNumber":5,"columnNumber":6} + - [2] {"functionName":"redirectFun","lineNumber":8,"columnNumber":6} - [3] {"functionName":"testFunction","function_lineNumber":0,"function_columnNumber":21,"lineNumber":19,"columnNumber":2} - [4] {"functionName":"","function_lineNumber":0,"function_columnNumber":0,"lineNumber":0,"columnNumber":0} First time paused, setting breakpoints! @@ -65,34 +65,21 @@ Script nr 3 parsed! Resuming... Paused #2 - [0] {"functionName":"call_debugger","function_lineNumber":13,"function_columnNumber":24,"lineNumber":15,"columnNumber":2} - - [1] {"functionName":"callDebugger","function_lineNumber":4,"function_columnNumber":25,"lineNumber":5,"columnNumber":6} - - [2] {"functionName":"redirectFun","function_lineNumber":7,"function_columnNumber":24,"lineNumber":8,"columnNumber":6} + - [1] {"functionName":"callDebugger","lineNumber":5,"columnNumber":6} + - [2] {"functionName":"redirectFun","lineNumber":8,"columnNumber":6} - [3] {"functionName":"testFunction","function_lineNumber":0,"function_columnNumber":21,"lineNumber":19,"columnNumber":2} - [4] {"functionName":"","function_lineNumber":0,"function_columnNumber":0,"lineNumber":0,"columnNumber":0} Script nr 4 parsed! Resuming... Paused #3 - - [0] {"functionName":"callDebugger","function_lineNumber":4,"function_columnNumber":25,"lineNumber":6,"columnNumber":4} - - [1] {"functionName":"redirectFun","function_lineNumber":7,"function_columnNumber":24,"lineNumber":8,"columnNumber":6} - - [2] {"functionName":"testFunction","function_lineNumber":0,"function_columnNumber":21,"lineNumber":19,"columnNumber":2} - - [3] {"functionName":"","function_lineNumber":0,"function_columnNumber":0,"lineNumber":0,"columnNumber":0} + - [0] {"functionName":"testFunction","function_lineNumber":0,"function_columnNumber":21,"lineNumber":21,"columnNumber":17} + - [1] {"functionName":"","function_lineNumber":0,"function_columnNumber":0,"lineNumber":0,"columnNumber":0} Script nr 5 parsed! Resuming... Paused #4 - - [0] {"functionName":"redirectFun","function_lineNumber":7,"function_columnNumber":24,"lineNumber":9,"columnNumber":4} - - [1] {"functionName":"testFunction","function_lineNumber":0,"function_columnNumber":21,"lineNumber":19,"columnNumber":2} - - [2] {"functionName":"","function_lineNumber":0,"function_columnNumber":0,"lineNumber":0,"columnNumber":0} -Script nr 6 parsed! -Resuming... -Paused #5 - - [0] {"functionName":"testFunction","function_lineNumber":0,"function_columnNumber":21,"lineNumber":21,"columnNumber":17} - - [1] {"functionName":"","function_lineNumber":0,"function_columnNumber":0,"lineNumber":0,"columnNumber":0} -Script nr 7 parsed! -Resuming... -Paused #6 - [0] {"functionName":"testFunction","function_lineNumber":0,"function_columnNumber":21,"lineNumber":22,"columnNumber":2} - [1] {"functionName":"","function_lineNumber":0,"function_columnNumber":0,"lineNumber":0,"columnNumber":0} -Script nr 8 parsed! +Script nr 6 parsed! Resuming... Running test: finished diff --git a/test/inspector/inspector.status b/test/inspector/inspector.status index c72c25c176..0fb349ecea 100644 --- a/test/inspector/inspector.status +++ b/test/inspector/inspector.status @@ -3,10 +3,6 @@ # found in the LICENSE file. [ -[ALWAYS, { - # Issue 6166. - 'debugger/asm-js-breakpoint-during-exec': [FAIL], -}], # ALWAYS ############################################################################## ['variant != default', {