Merge pull request hpi-swa#625 from jbrichau/fix-issue-623

Fix Pharo12 builds failing due to removal of Time>>millisecondsToRun:
Rinzwind · Jan 16, 2024 · 6a8c18c · 6a8c18c
2 parents 3f608f0 + d5eb761
commit 6a8c18c
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 6 deletions.
diff --git a/...ineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo3And4Packages..st b/...ineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo3And4Packages..st
@@ -17,9 +17,14 @@ setUpPharo3And4Packages: spec
 						includes: #('Ston')
 					].
 			spec
-				package: 'SmalltalkCI-Core' with: [ spec includes: #('SmalltalkCI-Pharo-Core') ];
+				package: 'SmalltalkCI-Core' 
+					with: [ spec includes: #('SmalltalkCI-Pharo-Core') ];
 				package: 'SmalltalkCI-Pharo-Core'
-					with: [ spec requires: #('SmalltalkCI-Core' 'SmalltalkCI-Coverage-Core') ];
+					with: [ spec requires: #('SmalltalkCI-Core') ];
+				package: 'SmalltalkCI-Coverage-Core' 
+					with: [ spec includes: #('SmalltalkCI-Pharo-Coverage-Core') ];
+				package: 'SmalltalkCI-Pharo-Coverage-Core'
+					with: [ spec requires: #('SmalltalkCI-Coverage-Core' 'SmalltalkCI-Pharo-Core') ];
 				package: 'SmalltalkCI-Pharo-Tests' with: [ spec requires: #('SmalltalkCI-Pharo-Core') ].
 			spec group: 'tests' with: #('SmalltalkCI-Pharo-Tests' 'SmalltalkCI-Coverage-Tests')
 			]
diff --git a/repository/SmalltalkCI-Core.package/SCITestRunner.class/instance/run.st b/repository/SmalltalkCI-Core.package/SCITestRunner.class/instance/run.st
@@ -1,3 +1,3 @@
 running
 run
-	[ self setUp. suiteTime := SmalltalkCI timeToRun: [ self runAll ] ] ensure: [ self tearDown ]
+	[ self setUp. suiteTime := SmalltalkCI platformClass timeToRun: [ self runAll ] ] ensure: [ self tearDown ]
diff --git a/repository/SmalltalkCI-Core.package/SCITestRunner.class/instance/runCase..st b/repository/SmalltalkCI-Core.package/SCITestRunner.class/instance/runCase..st
@@ -3,7 +3,7 @@ runCase: aTestCase
 	| result |
 	SmalltalkCI printDebug: aTestCase asString.
 	result := SCITestRunnerResult new testCase: aTestCase; yourself.
-	result time: (SmalltalkCI timeToRun: [
+	result time: (SmalltalkCI platformClass timeToRun: [
 		[ [ self basicRunCase: aTestCase ]
 			on: self class errorExceptions
 			do: [ :err |

diff --git a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/fold.on.block..st b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/fold.on.block..st
@@ -2,5 +2,5 @@ folding
 fold: aTitle on: aStream block: aBlock
 	| timeToRun |
 	aStream nextPutAll: (self foldTitle: aTitle); flush.
-	timeToRun := SmalltalkCI timeToRun: [ aBlock value ].
+	timeToRun := self timeToRun: [ aBlock value ].
 	aStream nextPutAll: self newLine, ' > Done in ', (self stringFor: timeToRun maxDecimalPlaces: 3), 'ms.', self newLine; flush
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/timeToRun..st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/class/timeToRun..st
@@ -0,0 +1,4 @@
+compatibility
+timeToRun: aBlock
+
+	^ aBlock millisecondsToRun
diff --git a/...ge/SCIPharo34CodeCoverage.class/README.md → ...ge/SCIPharo34CodeCoverage.class/README.md b/...ge/SCIPharo34CodeCoverage.class/README.md → ...ge/SCIPharo34CodeCoverage.class/README.md
diff --git a/...aro34CodeCoverage.class/class/linesOf..st → ...aro34CodeCoverage.class/class/linesOf..st b/...aro34CodeCoverage.class/class/linesOf..st → ...aro34CodeCoverage.class/class/linesOf..st
diff --git a/...Pharo34CodeCoverage.class/class/md5Of..st → ...Pharo34CodeCoverage.class/class/md5Of..st b/...Pharo34CodeCoverage.class/class/md5Of..st → ...Pharo34CodeCoverage.class/class/md5Of..st
diff --git a/...ass/class/methodReferenceFor.selector..st → ...ass/class/methodReferenceFor.selector..st b/...ass/class/methodReferenceFor.selector..st → ...ass/class/methodReferenceFor.selector..st
diff --git a/...erage.class/class/packageNameForClass..st → ...erage.class/class/packageNameForClass..st b/...erage.class/class/packageNameForClass..st → ...erage.class/class/packageNameForClass..st
diff --git a/...rage.class/class/packageNameForMethod..st → ...rage.class/class/packageNameForMethod..st b/...rage.class/class/packageNameForMethod..st → ...rage.class/class/packageNameForMethod..st
diff --git a/...erage.class/instance/allClassesToCover.st → ...erage.class/instance/allClassesToCover.st b/...erage.class/instance/allClassesToCover.st → ...erage.class/instance/allClassesToCover.st
diff --git a/...4CodeCoverage.class/methodProperties.json → ...4CodeCoverage.class/methodProperties.json b/...4CodeCoverage.class/methodProperties.json → ...4CodeCoverage.class/methodProperties.json
diff --git a/...Pharo34CodeCoverage.class/properties.json → ...Pharo34CodeCoverage.class/properties.json b/...Pharo34CodeCoverage.class/properties.json → ...Pharo34CodeCoverage.class/properties.json
@@ -1,5 +1,5 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
+	"category" : "SmalltalkCI-Pharo-Coverage-Core",
 	"classinstvars" : [
 		 ],
 	"classvars" : [