# HG changeset patch
# User Merge Script
# Date 1457070986 -3600
# Node ID bb05cfcd8427c76d5502dcc7a3d49aa84db94ace
# Parent  4c26321be573d2f0b68060e9dc2001d5e91d5ffa# Parent  bd6d9712e859dc80399d45959fcb16cd60020b97
Merge

diff -r 4c26321be573 -r bb05cfcd8427 .hgtags
--- a/.hgtags	Mon Jan 18 09:41:22 2016 +0000
+++ b/.hgtags	Fri Mar 04 06:56:26 2016 +0100
@@ -14,6 +14,11 @@
 4392c84aaf1c432b122f4ceb777f23f56b502758 expecco_2_7_5a
 545ea8f561b0b46c39eee6d078bb113bf8411ae8 expeccoNET_1_8_0_0
 678217bcd5d84be8c9f292ec6ee637cecee7a075 expecco_2_1_0
+7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_2_8_0
+7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_2_8_0a
+7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_ALM_1_9_5
+7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_ALM_1_9_6
+7798bf9ef44b2c230b69edb123f6b8613655ae08 expecco_ALM_1_9_7
 971a6aa7f424790a2be4836edce7fa4d368f81a8 stx_6_2_2
 b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_0
 b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_0_45_windows_final
@@ -21,7 +26,4 @@
 b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_0rc1
 b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_1
 b6e13772ac08deb97444c035765dc823e65b0ff2 expecco_2_6_2
-c5fdcba3c6828f688ad225007e26b7466b64e236 expecco_2_8_0
-c5fdcba3c6828f688ad225007e26b7466b64e236 expecco_ALM_1_9_5
-c5fdcba3c6828f688ad225007e26b7466b64e236 expecco_ALM_1_9_6
 f3f0f1f509187a858eaff11e4475621dc2dd20ae expeccoNET_1_6_8_0
diff -r 4c26321be573 -r bb05cfcd8427 quickSelfTest/SelfTest.st
--- a/quickSelfTest/SelfTest.st	Mon Jan 18 09:41:22 2016 +0000
+++ b/quickSelfTest/SelfTest.st	Fri Mar 04 06:56:26 2016 +0100
@@ -30,7 +30,7 @@
 
 Stdout showCR:'Loading sunit...'.
 Smalltalk loadPackage:'stx:goodies/sunit'.
-self assert:(TestCase notNil and:[TestCase isLoaded]).
+self assert:(TestCase notNil and:[TestCase isLoaded]) message:'[Error]: Missing TestCase class after sunit package load'.
 
 "/ Smalltalk loadPackage:'stx:goodies/xml/vw'.
 "/ Smalltalk loadPackage:'stx:goodies/xml/stx'.
@@ -46,6 +46,7 @@
 Stdout showCR:'Loading regression tests...'.
 
 "To add a new test please edit exept_regression>>testCaseNamesWithoutNamespace"
+Smalltalk packagePath addFirst:'../../../..'.
 Smalltalk fileInClass:#'exept_regression' package:'exept:regression'.
 (Smalltalk at: #'exept_regression') isNil ifTrue:[
     Stdout showCR:('ERROR: Ouch - missing class: "exept_regression"').