Merge jv
authorMerge Script
Fri, 04 Mar 2016 06:56:26 +0100
branchjv
changeset 300bb05cfcd8427
parent 296 4c26321be573 (current diff)
parent 299 bd6d9712e859 (diff)
child 302 567cade6bd72
Merge
     1.1 --- a/.hgtags	Mon Jan 18 09:41:22 2016 +0000
     1.2 +++ b/.hgtags	Fri Mar 04 06:56:26 2016 +0100
     1.3 @@ -14,6 +14,11 @@
     1.4  4392c84aaf1c432b122f4ceb777f23f56b502758 expecco_2_7_5a
     1.5  545ea8f561b0b46c39eee6d078bb113bf8411ae8 expeccoNET_1_8_0_0
     1.6  678217bcd5d84be8c9f292ec6ee637cecee7a075 expecco_2_1_0
     1.7 +7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_2_8_0
     1.8 +7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_2_8_0a
     1.9 +7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_ALM_1_9_5
    1.10 +7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_ALM_1_9_6
    1.11 +7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_ALM_1_9_7
    1.12  971a6aa7f424790a2be4836edce7fa4d368f81a8 stx_6_2_2
    1.13  b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_0
    1.14  b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_0_45_windows_final
    1.15 @@ -21,7 +26,4 @@
    1.16  b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_0rc1
    1.17  b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_1
    1.18  b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_2
    1.19 -c5fdcba3c6828f688ad225007e26b7466b64e236 expecco_2_8_0
    1.20 -c5fdcba3c6828f688ad225007e26b7466b64e236 expecco_ALM_1_9_5
    1.21 -c5fdcba3c6828f688ad225007e26b7466b64e236 expecco_ALM_1_9_6
    1.22  f3f0f1f509187a858eaff11e4475621dc2dd20ae expeccoNET_1_6_8_0
     2.1 --- a/quickSelfTest/SelfTest.st	Mon Jan 18 09:41:22 2016 +0000
     2.2 +++ b/quickSelfTest/SelfTest.st	Fri Mar 04 06:56:26 2016 +0100
     2.3 @@ -30,7 +30,7 @@
     2.4  
     2.5  Stdout showCR:'Loading sunit...'.
     2.6  Smalltalk loadPackage:'stx:goodies/sunit'.
     2.7 -self assert:(TestCase notNil and:[TestCase isLoaded]).
     2.8 +self assert:(TestCase notNil and:[TestCase isLoaded]) message:'[Error]: Missing TestCase class after sunit package load'.
     2.9  
    2.10  "/ Smalltalk loadPackage:'stx:goodies/xml/vw'.
    2.11  "/ Smalltalk loadPackage:'stx:goodies/xml/stx'.
    2.12 @@ -46,6 +46,7 @@
    2.13  Stdout showCR:'Loading regression tests...'.
    2.14  
    2.15  "To add a new test please edit exept_regression>>testCaseNamesWithoutNamespace"
    2.16 +Smalltalk packagePath addFirst:'../../../..'.
    2.17  Smalltalk fileInClass:#'exept_regression' package:'exept:regression'.
    2.18  (Smalltalk at: #'exept_regression') isNil ifTrue:[
    2.19      Stdout showCR:('ERROR: Ouch - missing class: "exept_regression"').