A new version of KernelTests was added to project The Inbox:
http://source.squeak.org/inbox/KernelTests-cmm.169.mcz ==================== Summary ==================== Name: KernelTests-cmm.169 Author: cmm Time: 4 January 2011, 2:54:20.261 pm UUID: 63f1b572-d2e1-4ee7-a764-70b0cc9f760b Ancestors: KernelTests-ul.168 Unmerged KernelTests-ar.171. =============== Diff against KernelTests-ul.168 =============== Item was added: + ----- Method: Process>>suspendPrimitivelyOrFail (in category '*KernelTests-Processes') ----- + suspendPrimitivelyOrFail + "Test support. Execute primitive 88, or fail." + + <primitive: 88> + ^self primitiveFailed! Item was added: + ClassTestCase subclass: #ProcessTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'KernelTests-Processes'! Item was added: + ----- Method: ProcessTest>>testAtomicSuspend (in category 'tests') ----- + testAtomicSuspend + "Test atomic suspend of foreign processes" + + | list p sema | + sema := Semaphore new. + p := [sema wait] fork. + Processor yield. + self shouldnt: [list := p suspendPrimitivelyOrFail] raise: Error. + self assert: list == sema. + ! |
On Tue, 4 Jan 2011, [hidden email] wrote:
> A new version of KernelTests was added to project The Inbox: > http://source.squeak.org/inbox/KernelTests-cmm.169.mcz > > ==================== Summary ==================== > > Name: KernelTests-cmm.169 > Author: cmm > Time: 4 January 2011, 2:54:20.261 pm > UUID: 63f1b572-d2e1-4ee7-a764-70b0cc9f760b > Ancestors: KernelTests-ul.168 > > Unmerged KernelTests-ar.171. This won't work, because images already have KernelTests-ar.171. If you move this to the Trunk, the update mechanism will try to merge it. Since there are conflicts, it won't work automatically. The proper way to do it is to remove/revert the changes starting from KernelTests-ar.171 and save that as a new version IMHO. Levente > > =============== Diff against KernelTests-ul.168 =============== > > Item was added: > + ----- Method: Process>>suspendPrimitivelyOrFail (in category '*KernelTests-Processes') ----- > + suspendPrimitivelyOrFail > + "Test support. Execute primitive 88, or fail." > + > + <primitive: 88> > + ^self primitiveFailed! > > Item was added: > + ClassTestCase subclass: #ProcessTest > + instanceVariableNames: '' > + classVariableNames: '' > + poolDictionaries: '' > + category: 'KernelTests-Processes'! > > Item was added: > + ----- Method: ProcessTest>>testAtomicSuspend (in category 'tests') ----- > + testAtomicSuspend > + "Test atomic suspend of foreign processes" > + > + | list p sema | > + sema := Semaphore new. > + p := [sema wait] fork. > + Processor yield. > + self shouldnt: [list := p suspendPrimitivelyOrFail] raise: Error. > + self assert: list == sema. > + ! > > > |
On 05.01.2011, at 12:56, Levente Uzonyi wrote: > On Tue, 4 Jan 2011, [hidden email] wrote: > >> A new version of KernelTests was added to project The Inbox: >> http://source.squeak.org/inbox/KernelTests-cmm.169.mcz >> >> ==================== Summary ==================== >> >> Name: KernelTests-cmm.169 >> Author: cmm >> Time: 4 January 2011, 2:54:20.261 pm >> UUID: 63f1b572-d2e1-4ee7-a764-70b0cc9f760b >> Ancestors: KernelTests-ul.168 >> >> Unmerged KernelTests-ar.171. > > This won't work, because images already have KernelTests-ar.171. If you move this to the Trunk, the update mechanism will try to merge it. Since there are conflicts, it won't work automatically. The proper way to do it is to remove/revert the changes starting from KernelTests-ar.171 and save that as a new version IMHO. +1 - Bert - |
In reply to this post by Levente Uzonyi-2
Hmm, I merged it into a 10853 image and there were no conflicts... ??
On Wed, Jan 5, 2011 at 5:56 AM, Levente Uzonyi <[hidden email]> wrote: > On Tue, 4 Jan 2011, [hidden email] wrote: > >> A new version of KernelTests was added to project The Inbox: >> http://source.squeak.org/inbox/KernelTests-cmm.169.mcz >> >> ==================== Summary ==================== >> >> Name: KernelTests-cmm.169 >> Author: cmm >> Time: 4 January 2011, 2:54:20.261 pm >> UUID: 63f1b572-d2e1-4ee7-a764-70b0cc9f760b >> Ancestors: KernelTests-ul.168 >> >> Unmerged KernelTests-ar.171. > > This won't work, because images already have KernelTests-ar.171. If you move > this to the Trunk, the update mechanism will try to merge it. Since there > are conflicts, it won't work automatically. The proper way to do it is to > remove/revert the changes starting from KernelTests-ar.171 and save that as > a new version IMHO. > > > Levente > >> >> =============== Diff against KernelTests-ul.168 =============== >> >> Item was added: >> + ----- Method: Process>>suspendPrimitivelyOrFail (in category >> '*KernelTests-Processes') ----- >> + suspendPrimitivelyOrFail >> + "Test support. Execute primitive 88, or fail." >> + >> + <primitive: 88> >> + ^self primitiveFailed! >> >> Item was added: >> + ClassTestCase subclass: #ProcessTest >> + instanceVariableNames: '' >> + classVariableNames: '' >> + poolDictionaries: '' >> + category: 'KernelTests-Processes'! >> >> Item was added: >> + ----- Method: ProcessTest>>testAtomicSuspend (in category 'tests') ----- >> + testAtomicSuspend >> + "Test atomic suspend of foreign processes" >> + >> + | list p sema | >> + sema := Semaphore new. >> + p := [sema wait] fork. >> + Processor yield. >> + self shouldnt: [list := p suspendPrimitivelyOrFail] raise: Error. >> + self assert: list == sema. >> + ! >> >> >> > > |
Free forum by Nabble | Edit this page |