Changed baseline to use separate test package name from GemStome32 onwards instead of a 'file' spec hack (which breaks working in Tode)

Johan Brichau · Johan Brichau · commit 48a57af0b651 · 2020-07-03T16:02:52.000+02:00
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st
@@ -34,15 +34,13 @@ baselineGemStone: spec
         package: 'Grease-Tests-Core'
           with: [ 
               spec
-                requires: #('Grease-GemStone-Core');
-                includes: #('Grease-Tests-GemStone-Core') ];
+                requires: #('Grease-GemStone-Core') ];
         package: 'Grease-GemStone-Core'
           with: [ 
               spec
                 requires:
-                  #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
-        package: 'Grease-Tests-GemStone-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ] ].
+                  #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ] ].
+
   spec
     for: #'gs2.x'
     do: [ 
@@ -89,9 +87,20 @@ baselineGemStone: spec
               spec
                 requires: #('Grease-GemStone-Core');
                 postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
+
+	spec for: #(#'gs2.x' #'gs3.0.x' #'gs3.1.x') 
+		do:[
+	      spec
+        package: 'Grease-Tests-GemStone-Core'
+		    with:[ spec requires: 'Grease-Tests-Core' ];
+		  package: 'Grease-Tests-Core'
+        	 with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ].
+
   spec
     for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
     do: [ 
       spec
-        package: 'Grease-Tests-GemStone-Core'
-        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
+        package: 'Grease-Tests-GemStone32-Core'
+		    with:[ spec requires: 'Grease-Tests-Core' ];
+		  package: 'Grease-Tests-Core'
+        	 with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]
