isolate the GsProcess instances held onto by stack frames in the stac…

…k in a TransientValue, so that Travis can persist the stack workaround for hpi-swa/smalltalkCI#237
dalehenrich · Nov 22, 2016 · 4580665 · 4580665
1 parent 7564bfa
commit 4580665
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/...Stone-Server3x-Tests.package/TDStackFrameTests.class/instance/runTestBlockReturnStack..st b/...Stone-Server3x-Tests.package/TDStackFrameTests.class/instance/runTestBlockReturnStack..st
@@ -12,8 +12,8 @@ runTestBlockReturnStack: aBlock
       sem signal.
       sem2 wait ] ] fork.
   sem wait.
-  ^ TDStack new
-    process: process;
-    exception: exception;
-    createFrames;
-    yourself
+  ^ TransientValue value: (TDStack new
+        process: process;
+        exception: exception;
+        createFrames;
+        yourself)
diff --git a/...one-Server3x-Tests.package/TDStackFrameTests.class/instance/testNestedNoSelfReferences.st b/...one-Server3x-Tests.package/TDStackFrameTests.class/instance/testNestedNoSelfReferences.st
@@ -3,7 +3,7 @@ testNestedNoSelfReferences
   | stack haltMethodFrame baseNodeMap argAndTempNames block haltMethodCallFrame noSelfFrame x |
   block := [ self nestedBlockNoSelf ].
   stack := self runTestBlockReturnStack: block.
-  haltMethodFrame := self findHaltMethodFrameFrom: stack.
+  haltMethodFrame := self findHaltMethodFrameFrom: stack value.
   haltMethodCallFrame := haltMethodFrame next.
   noSelfFrame := haltMethodCallFrame next.
   baseNodeMap := noSelfFrame baseNodeMap.
@@ -27,5 +27,4 @@ testNestedNoSelfReferences
   self assert: (argAndTempNames at: 3) = '.t1'.
   self assert: (argAndTempNames at: 4) = '.t2'.
   self assert: (x := noSelfFrame argAndTempNamesAt: 1) == 1.
-  self assert: (x := noSelfFrame argAndTempNamesAt: 2) == 1.
-  self halt
+  self assert: (x := noSelfFrame argAndTempNamesAt: 2) == 1
diff --git a/...Stone-Server3x-Tests.package/TDStackFrameTests.class/instance/testNestedTempReferences.st b/...Stone-Server3x-Tests.package/TDStackFrameTests.class/instance/testNestedTempReferences.st
@@ -3,7 +3,7 @@ testNestedTempReferences
   | stack haltMethodFrame baseNodeMap argAndTempNames x block haltMethodCallFrame nestedBlockFrame |
   block := [ self nestedBlockMethodWithArgs: 1 b: 2 ].
   stack := self runTestBlockReturnStack: block.
-  haltMethodFrame := self findHaltMethodFrameFrom: stack.
+  haltMethodFrame := self findHaltMethodFrameFrom: stack value.
   haltMethodCallFrame := haltMethodFrame next.
   baseNodeMap := haltMethodCallFrame baseNodeMap.
   argAndTempNames := haltMethodCallFrame argAndTempNames.

diff --git a/.../Tode-GemStone-Server3x-Tests.package/TDStackFrameTests.class/instance/testSimpleStack.st b/.../Tode-GemStone-Server3x-Tests.package/TDStackFrameTests.class/instance/testSimpleStack.st
@@ -2,7 +2,7 @@ tests
 testSimpleStack
   | stack haltMethod haltMethodFrame x argAndTempNames |
   stack := self runTestBlockReturnStack: [ self haltMethod ].
-  haltMethodFrame := self findHaltMethodFrameFrom: stack.
+  haltMethodFrame := self findHaltMethodFrameFrom: stack value.
   argAndTempNames := haltMethodFrame argAndTempNames.
   self assert: argAndTempNames size == 1.
   self assert: (argAndTempNames at: 1) = '.t1'.

diff --git a/...y/Tode-GemStone-Server3x-Tests.package/TDStackFrameTests.class/instance/testSimpleTemp.st b/...y/Tode-GemStone-Server3x-Tests.package/TDStackFrameTests.class/instance/testSimpleTemp.st
@@ -6,7 +6,7 @@ testSimpleTemp
   innermostBlock := [ self haltMethod ].
   innermostBlock value ].
   stack := self runTestBlockReturnStack: outermostBlock.
-  haltMethodFrame := self findHaltMethodFrameFrom: stack.
+  haltMethodFrame := self findHaltMethodFrameFrom: stack value.
   baseNodeMap := haltMethodFrame baseNodeMap.
   self assert: baseNodeMap size == 2.
   self assert: (baseNodeMap includesKey: '(context)').

diff --git a/...sitory/Tode-GemStone-Server3x-Tests.package/TDStackFrameTests.class/methodProperties.json b/...sitory/Tode-GemStone-Server3x-Tests.package/TDStackFrameTests.class/methodProperties.json
@@ -6,9 +6,9 @@
 		"haltMethod" : "dkh 11/21/2016 15:47",
 		"nestedBlockMethodWithArgs:b:" : "dkh 11/21/2016 17:01",
 		"nestedBlockNoSelf" : "dkh 11/21/2016 17:26",
-		"runTestBlockReturnStack:" : "dkh 11/21/2016 17:28",
-		"testNestedNoSelfReferences" : "dkh 11/21/2016 17:40",
-		"testNestedTempReferences" : "dkh 11/21/2016 17:40",
-		"testSimpleStack" : "dkh 11/21/2016 16:41",
-		"testSimpleTemp" : "dkh 11/21/2016 17:39",
+		"runTestBlockReturnStack:" : "dkh 11/22/2016 11:03",
+		"testNestedNoSelfReferences" : "dkh 11/22/2016 11:02",
+		"testNestedTempReferences" : "dkh 11/22/2016 11:02",
+		"testSimpleStack" : "dkh 11/22/2016 11:02",
+		"testSimpleTemp" : "dkh 11/22/2016 11:02",
 		"theHaltMethod" : "dkh 11/21/2016 16:16" } }
diff --git a/repository/Tode-GemStone-Server3x-Tests.package/monticello.meta/version b/repository/Tode-GemStone-Server3x-Tests.package/monticello.meta/version
@@ -1 +1 @@
-(name 'Tode-GemStone-Server3x-Tests-dkh.5' message 'remove a bit of redundancy in TDStackFrame tests ...' id '7fb6e118-9af7-4ca2-84ff-68ff5cd28a5c' date '11/21/2016' time '17:40:57' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.4' message 'one more test to cover case where the block does not reference self directly ... ' id 'f82958e8-6a6f-4646-8d23-d6c1330a0224' date '11/21/2016' time '17:35:49' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.3' message 'add a couple of tests for TDStackFrame args and temp logic ...' id 'd843bf32-2c3c-452e-8497-d04d0d7189f4' date '11/21/2016' time '17:15:16' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.2' message 'move TDProjectEntryOutermostProjectPathTests to Tode-GemStone-Server3x-Tests ... I want 2.4.x variant of tODE to be mostly functional but the [failure of this test for 2.4.x](https://travis-ci.org/dalehenrich/tode/jobs/107915730#L3872) is way to esoteric to spend much time fixing for 2.4.x' id 'aefe7f03-ea52-45a9-a849-5d7af51ed161' date '02/08/2016' time '17:14:53' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.1' message '`gs sslLog` command only applies to gemstone 3.x' id '42d5bfa4-f01d-4bb0-b7f7-79b579ee600c' date '02/08/2016' time '16:50:08' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'Tode-GemStone-Server3x-Tests-dkh.6' message 'isolate the GsProcess instances held onto by stack frames in the stack in a TransientValue, so that Travis can persist the stack workaround for https://github.com/hpi-swa/smalltalkCI/issues/237' id '315dd20d-4194-45c6-a532-e492d7147146' date '11/22/2016' time '11:09:10' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.5' message 'remove a bit of redundancy in TDStackFrame tests ...' id '7fb6e118-9af7-4ca2-84ff-68ff5cd28a5c' date '11/21/2016' time '17:40:57' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.4' message 'one more test to cover case where the block does not reference self directly ... ' id 'f82958e8-6a6f-4646-8d23-d6c1330a0224' date '11/21/2016' time '17:35:49' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.3' message 'add a couple of tests for TDStackFrame args and temp logic ...' id 'd843bf32-2c3c-452e-8497-d04d0d7189f4' date '11/21/2016' time '17:15:16' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.2' message 'move TDProjectEntryOutermostProjectPathTests to Tode-GemStone-Server3x-Tests ... I want 2.4.x variant of tODE to be mostly functional but the [failure of this test for 2.4.x](https://travis-ci.org/dalehenrich/tode/jobs/107915730#L3872) is way to esoteric to spend much time fixing for 2.4.x' id 'aefe7f03-ea52-45a9-a849-5d7af51ed161' date '02/08/2016' time '17:14:53' author 'dkh' ancestors ((name 'Tode-GemStone-Server3x-Tests-dkh.1' message '`gs sslLog` command only applies to gemstone 3.x' id '42d5bfa4-f01d-4bb0-b7f7-79b579ee600c' date '02/08/2016' time '16:50:08' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())