# HG changeset patch
# User Merge Script
# Date 1480916889 -3600
# Node ID 8ec01ca33d6ebc9ed327e41e9827360b260e48c5
# Parent  9ec2abb1218ecb50151cbaa3c41440dca8239578# Parent  ef82ce6fb3e99ccc2a92660f67802177d0e8e885
Merge

diff -r 9ec2abb1218e -r 8ec01ca33d6e .hgtags
--- a/.hgtags	Mon Nov 14 23:43:14 2016 +0000
+++ b/.hgtags	Mon Dec 05 06:48:09 2016 +0100
@@ -2,6 +2,10 @@
 1ce506fc7d855f0c8c61d14ec8d6aecd3e4c1d93 expecco_2_4_1
 24df7fe6d628f83445c3b76e5eb53310b137520c initialR
 258f98c24a4ea30137f622291db0d03ed808fdd9 expeccoALM_1_9_0_1
+28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_0
+28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_0_a
+28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_0_win75_lx36
+28efe39657f5027e1b8fc585c69ff731aca133c6 expecco_2_9_1
 29a8a74674f552a856e108465497c0b7169a340c expecco_2_2_0
 29a8a74674f552a856e108465497c0b7169a340c expecco_2_2_5
 3f9e255e7d47d6949286e64dab39c7acfedf02a4 expecco_2_5_0
diff -r 9ec2abb1218e -r 8ec01ca33d6e reports/Builder__TestReportFormat.st
--- a/reports/Builder__TestReportFormat.st	Mon Nov 14 23:43:14 2016 +0000
+++ b/reports/Builder__TestReportFormat.st	Mon Dec 05 06:48:09 2016 +0100
@@ -303,18 +303,18 @@
 writeTestCase:testcase outcome:outcome time:time exception: exception stacktrace:stacktrace
     | result |
 
-    outcome result == TestResult statePass ifTrue:[ 
+    outcome result == TestResult statePass ifTrue:[
         result := #pass.
-    ] ifFalse:[ 
-        outcome result == TestResult stateFail ifTrue:[ 
+    ] ifFalse:[
+        outcome result == TestResult stateFail ifTrue:[
             result := #failure.
             failures := failures + 1
-        ] ifFalse:[ 
-            outcome result == TestResult stateError ifTrue:[ 
+        ] ifFalse:[
+            outcome result == TestResult stateError ifTrue:[
                 result := #error.
                 errors := errors + 1.
-            ] ifFalse:[ 
-                outcome result == TestResult stateSkip ifTrue:[ 
+            ] ifFalse:[
+                outcome result == TestResult stateSkip ifTrue:[
                     result := #skip.
                     skipped := skipped + 1
                 ] ifFalse:[
@@ -324,11 +324,11 @@
         ].
     ].
 
-    stream tab; 
-            nextPutAll: '<testcase classname="'; 
-            nextPutAll: (self encode: testcase nameForHDTestReport); 
-            nextPutAll: '" name="'; 
-            nextPutAll: (self encode: testcase selectorForHDTestReport); 
+    stream tab;
+            nextPutAll: '<testcase classname="';
+            nextPutAll: (self encode: testcase nameForHDTestReport);
+            nextPutAll: '" name="';
+            nextPutAll: (self encode: testcase selectorForHDTestReport);
             nextPutAll: '" time="'; print: (time ? 0) / 1000.0; nextPutAll: '">'; cr.
 
     result == #skip ifTrue:[
@@ -339,12 +339,12 @@
 
             exception isNil ifTrue:[
                 type := 'unknown exception'.
-                message := 'unknown exception occured (no exception details available)'
+                message := 'unknown exception occurred (no exception details available)'
             ] ifFalse:[
                 type := exception class name.
                 message := exception messageText ifNil:[ exception description ].
             ].
-            
+
 
             stream tab; tab;
                 nextPut:$<; nextPutAll: result;
@@ -364,10 +364,10 @@
             stream nextPutAll:'    <system-out><!![CDATA['; cr.
             self writeCDATA: outcome collectedOutput.
             stream nextPutAll:']]> </system-out>'; cr.
-        ].   
+        ].
     ].
 
-    stream tab; 
+    stream tab;
             nextPutAll: '</testcase>'; cr.
 
 
diff -r 9ec2abb1218e -r 8ec01ca33d6e reports/run.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/reports/run.sh	Mon Dec 05 06:48:09 2016 +0100
@@ -0,0 +1,1 @@
+../../../projects/smalltalk/stx -I --noBanner  -f report-runner.st -D /tmp -r Builder::TestReport -p exept:regression