Merge frmo origin

2 files changed, 5 insertions, 2 deletions

diff --git a/xdelta3/go/src/xdelta/run.go b/xdelta3/go/src/xdelta/run.go
index 6523a1c..448fabe 100644
--- a/xdelta3/go/src/xdelta/run.go
+++ b/xdelta3/go/src/xdelta/run.go
@@ -55,7 +55,8 @@ func (r *Runner) RunTest(name string, f func (t *TestGroup)) {
         c := make(chan interface{})
         go func() {
                 defer func() {
-                        c <- recover()
+                        rec := recover()
+                        c <- rec
                 }()
                 fmt.Println("Testing", name, "...")
                 f(t)
diff --git a/xdelta3/go/src/xdelta/tgroup.go b/xdelta3/go/src/xdelta/tgroup.go
index b1b04ec..602b1e1 100644
--- a/xdelta3/go/src/xdelta/tgroup.go
+++ b/xdelta3/go/src/xdelta/tgroup.go
@@ -58,7 +58,9 @@ func (g *Goroutine) OK() {
 
 func (g *Goroutine) Panic(err error) {
         g.finish(err)
-        runtime.Goexit()
+        if g != g.TestGroup.main {
+                runtime.Goexit()
+        }
 }
 
 func (t *TestGroup) Main() *Goroutine { return t.main }