Skip to content
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

Jump to bottom

feat: only instantiate test resources once in Pharo #662

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+434 −642
Open

feat: only instantiate test resources once in Pharo #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea80c58
feat: only instantiate test resources once in Pharo
theseion Sep 17, 2024
6c9fcbc
fix: force load SmalltalkCI in images that already contain it
theseion Sep 18, 2024
51ea314
chore: apply review suggestions
theseion Sep 19, 2024
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
28 changes: 20 additions & 8 deletions gtoolkit/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,19 @@ gtoolkit::load_project() {
metacello := Metacello new
baseline: 'SmalltalkCI';
repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
onUpgrade: [ :ex | ex useIncoming ].
onUpgrade: [ :ex | ex useIncoming ];
ignoreImage.
(Metacello canUnderstand: #onConflictUseIncoming)
ifTrue: [ metacello onConflictUseIncoming ]
ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
metacello load ]
on: Warning
do: [ :w | w resume ].
([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
on: KeyNotFound
do: [ :keyEx | keyEx resumeUnchecked: nil ])
ifNil: [ metacello load ]
ifNotNil: [ :exceptionClass |
[ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
on: Warning
do: [ :w | w resume ].
smalltalkCI := Smalltalk at: #SmalltalkCI.
smalltalkCI load: '$(resolve_path "${config_ston}")'.
(smalltalkCI isHeadless or: [ smalltalkCI promptToProceed ])
Expand All @@ -205,13 +211,19 @@ gtoolkit::test_project() {
metacello := Metacello new
baseline: 'SmalltalkCI';
repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
onUpgrade: [ :ex | ex useIncoming ].
onUpgrade: [ :ex | ex useIncoming ];
ignoreImage.
(Metacello canUnderstand: #onConflictUseIncoming)
ifTrue: [ metacello onConflictUseIncoming ]
ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
metacello load ]
on: Warning
do: [ :w | w resume ].
([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
on: KeyNotFound
do: [ :keyEx | keyEx resumeUnchecked: nil ])
ifNil: [ metacello load ]
ifNotNil: [ :exceptionClass |
[ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
on: Warning
do: [ :w | w resume ].
Smalltalk at: #SmalltalkCI ].
smalltalkCI test: '$(resolve_path "${config_ston}")'
"
Expand Down
28 changes: 20 additions & 8 deletions pharo/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,13 +367,19 @@ pharo::load_project() {
metacello := Metacello new
baseline: 'SmalltalkCI';
repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
onUpgrade: [ :ex | ex useIncoming ].
onUpgrade: [ :ex | ex useIncoming ];
ignoreImage.
(Metacello canUnderstand: #onConflictUseIncoming)
ifTrue: [ metacello onConflictUseIncoming ]
ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
metacello load ]
on: Warning
do: [ :w | w resume ].
([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
on: KeyNotFound
do: [ :keyEx | keyEx resumeUnchecked: nil ])
ifNil: [ metacello load ]
ifNotNil: [ :exceptionClass |
[ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
on: Warning
do: [ :w | w resume ].
smalltalkCI := Smalltalk at: #SmalltalkCI.
smalltalkCI load: '$(resolve_path "${config_ston}")'.
(smalltalkCI isHeadless or: [ smalltalkCI promptToProceed ])
Expand All @@ -395,13 +401,19 @@ pharo::test_project() {
metacello := Metacello new
baseline: 'SmalltalkCI';
repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
onUpgrade: [ :ex | ex useIncoming ].
onUpgrade: [ :ex | ex useIncoming ];
ignoreImage.
(Metacello canUnderstand: #onConflictUseIncoming)
ifTrue: [ metacello onConflictUseIncoming ]
ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
metacello load ]
on: Warning
do: [ :w | w resume ].
([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
on: KeyNotFound
do: [ :keyEx | keyEx resumeUnchecked: nil ])
ifNil: [ metacello load ]
ifNotNil: [ :exceptionClass |
[ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
on: Warning
do: [ :w | w resume ].
Smalltalk at: #SmalltalkCI ].
smalltalkCI test: '$(resolve_path "${config_ston}")'
"
Expand Down
5 changes: 3 additions & 2 deletions repository/SmalltalkCI-Pharo-Core.package/.filetree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"noMethodMetaData" : true,
"separateMethodMetaAndSource" : false,
"useCypressPropertiesFile" : true }
"noMethodMetaData" : true,
"useCypressPropertiesFile" : true
}
0 ...Platform.extension/instance/authorName.st → ...latform.extension/instance/authorName..st
View file
Open in desktop
File renamed without changes.
5 changes: 0 additions & 5 deletions .../SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ...sitory/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"name" : "IceMetacelloPharoPlatform" }
"name" : "IceMetacelloPharoPlatform"
}
5 changes: 0 additions & 5 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/methodProperties.json
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "SCIPharoCustomScript",
"pools" : [
],
"super" : "SCICustomScript",
"type" : "normal" }
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "SCIPharoCustomScript",
"type" : "normal"
}
8 changes: 0 additions & 8 deletions ...tory/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/methodProperties.json
View file
Open in desktop

This file was deleted.

22 changes: 10 additions & 12 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
"registerInIceberg"
],
"name" : "SCIPharoMetacelloLoadSpec",
"pools" : [
],
"super" : "SCIMetacelloLoadSpec",
"type" : "normal" }
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [
"registerInIceberg"
],
"name" : "SCIPharoMetacelloLoadSpec",
"type" : "normal"
}
6 changes: 0 additions & 6 deletions ...ory/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/methodProperties.json
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "SCIPharoMonticelloLoadSpec",
"pools" : [
],
"super" : "SCIMonticelloLoadSpec",
"type" : "normal" }
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "SCIPharoMonticelloLoadSpec",
"type" : "normal"
}
29 changes: 21 additions & 8 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/class/runClasses.spec..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
running
runClasses: aCollectionOfClasses spec: aSCISpec
| suite classes |
suite := TestSuite named: aSCISpec name.
classes := (aCollectionOfClasses
select: [ :each | (each includesBehavior: TestCase) and: [ each isAbstract not ] ])
asSortedCollection: [ :a :b | a name <= b name ].
classes
do: [ :each | suite addTest: each suite ].
^ self runSuite: suite spec: aSCISpec

| suite classes resources |
suite := TestSuite named: aSCISpec name.
classes := (aCollectionOfClasses select: [ :each |
(each includesBehavior: TestCase) and: [
each isAbstract not ] ]) asSortedCollection: [ :a :b |
a name <= b name ].

resources := OrderedCollection new.
classes do: [ :class |
| classSuite |
classSuite := class suite.
resources addAll: (classSuite resources reject: [ :resource |
resources includes: resource ]).
"Reset resources of nested suit. Resources are managed by the outermost suite."
classSuite resources: #( ).
suite addTest: classSuite ].

suite resources: resources.

^ self runSuite: suite spec: aSCISpec
13 changes: 0 additions & 13 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/methodProperties.json
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "SCIPharoTestRunner",
"pools" : [
],
"super" : "SCITestRunner",
"type" : "normal" }
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "SCIPharoTestRunner",
"type" : "normal"
}
6 changes: 0 additions & 6 deletions ...tory/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/methodProperties.json
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "SCIPharoTestRunnerPharo10",
"pools" : [
],
"super" : "SCIPharoTestRunnerPharo9",
"type" : "normal" }
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "SCIPharoTestRunnerPharo10",
"type" : "normal"
}
8 changes: 0 additions & 8 deletions ...itory/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo9.class/methodProperties.json
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/methodProperties.json
View file
Open in desktop

This file was deleted.

19 changes: 10 additions & 9 deletions repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"commentStamp" : "",
"super" : "SmalltalkCI",
"category" : "SmalltalkCI-Pharo-Core",
"classinstvars" : [
],
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [
"StdOut" ],
"commentStamp" : "",
"StdOut"
],
"instvars" : [
"suiteName" ],
"suiteName"
],
"name" : "SmalltalkCIPharo",
"pools" : [
],
"super" : "SmalltalkCI",
"type" : "normal" }
"type" : "normal"
}
Loading