Skip to content

Synchronisation with Pharo 10 branch #43

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
StevenCostiou merged 4 commits into from
Jul 7, 2022
Merged

Synchronisation with Pharo 10 branch #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7d8656
The test #testIsExecutionFinished is cleaned to not depend on the par…
dionisiydk Aug 25, 2021
81756a8
Merge pull request #15 from pharo-spec/master
tesonep Oct 12, 2021
938dd2c
Merge pull request #14 from dionisiydk/prepareForRealActiveProcessInP…
tesonep Dec 2, 2021
3632505
Merge pull request #1 from adri09070/Pharo-10
adri09070 Jul 7, 2022
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: 9 additions & 10 deletions Sindarin-Tests/SindarinDebuggerTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,19 +385,18 @@ SindarinDebuggerTest >> testIsAboutToInstantiateClass [

{ #category : #tests }
SindarinDebuggerTest >> testIsExecutionFinished [
"Test shows that the debugger is actually not correctly working and therefore it is disabled.
The fix requires the changes in #isExecutionFinished and on the Pharo side (PR#8567)
Once integrated there will be another PR here.
Projects are managed in different repos and therfore such complex integration"
| scdbg |
self skipOnPharoCITestingEnvironment.
scdbg := SindarinDebugger debug: [ self helperMethod16 ].
self deny: scdbg isExecutionFinished.
scdbg
stepOver;
step;
step;
stepOver;
step;
stepOver;
step.
"Reached `self isActiveProcess` in Process>>#terminate"
self assert: scdbg isExecutionFinished

[ scdbg isExecutionFinished ] whileFalse: [ scdbg stepOver ].

self assert: scdbg currentProcess isTerminated
]

{ #category : #tests }
Expand Down
13 changes: 5 additions & 8 deletions Sindarin/SindarinDebugger.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,16 +207,13 @@ SindarinDebugger >> deactivateAutoRefreshOfAttachedGraphicalDebugger [
{ #category : #start }
SindarinDebugger >> debug: aBlock [
blockToDebug := aBlock.
process := aBlock newProcess
name: 'ExecutionDebuggedByScriptableDebugger'.

"process on: Exception do: [:ex | DebuggedExecutionSignalledAnException signalWithException: ex. ex resume ]."
process := aBlock newProcess name: 'ExecutionDebuggedByScriptableDebugger'.
sindarinSession := SindarinDebugSession
newWithName: 'ScriptableDebuggerDebugSession'
forProcess: process.
sindarinSession deactivateEventTriggering.
[ self selector = #newProcess ] whileFalse: [ self step ]. "Step the process to get out of the on:do: context added at the bottom of its stack"
[ self selector = #newProcess ] whileTrue: [ self step ]. "Step the process so that it leaves BlockClosure>>#newProcess and enters the block for which a process was created"
"Step the process until it enters the block for which a process was created"
[ self context closure == blockToDebug ] whileFalse: [ self step ]
]

{ #category : #accessing }
Expand Down Expand Up @@ -668,8 +665,8 @@ SindarinDebugger >> stepOver [
startContext := self context.
self step.
[ self context == startContext
or: [ startContext sender isNil
or: [ startContext hasSender: self context ] ] ]
or: [ (startContext isDead or: [ self context isDead ])
or: [ startContext hasSender: self context ]]]
whileFalse: [ self step ]
]

Expand Down