Skip to content

Prepare for #realActiveProcess integration in Pharo #14

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
tesonep merged 1 commit into from
Dec 2, 2021
Merged

Prepare for #realActiveProcess integration in Pharo #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
The test #testIsExecutionFinished is cleaned to not depend on the par… 
…ticular implementation of Process>>#terminate method. And this clean version actually shows that the debugger does not work correctly. Therefore the test is disabled on CI for now.

This change is required to properly integrate PR#8567 (realActiveProcess) into Pharo without breaking the existing tests of Sindarin project.
Once Pharo PR  will be integrated the fix for Sindarin test will be pushed. The SindarinDebugger methods are required for the this fix but they do not break other parts in current image and therefore they are included here.
  • Loading branch information
@dionisiydk
dionisiydk committed Aug 25, 2021
commit f7d86562a90a1036fe7d5fe9f1609c78f5f4d9db
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 @@ -359,19 +359,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 @@ -205,16 +205,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 @@ -620,8 +617,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