Merge frmo origin

3 files changed, 8 insertions, 7 deletions

diff --git a/xdelta3/go/src/regtest.go b/xdelta3/go/src/regtest.go
index bcf0de9..a7cab33 100644
--- a/xdelta3/go/src/regtest.go
+++ b/xdelta3/go/src/regtest.go
@@ -13,8 +13,8 @@ import (
 
 const (
         xdataset = "/volume/home/jmacd/src/testdata"
-        xcompare = "/volume/home/jmacd/src/xdelta3-devel/xdelta3/xdelta3"
-        xdelta3 = "/volume/home/jmacd/src/xdelta-64bithash/xdelta3/xdelta3"
+        xcompare = "/volume/home/jmacd/src/xdelta-devel/xdelta3/xdelta3"
+        xdelta3  = "/volume/home/jmacd/src/xdelta-64bithash/xdelta3/xdelta3"
         seed = 1422253499919909358
 )
 
@@ -35,12 +35,10 @@ func (c Config) smokeTest(t *xdelta.TestGroup, p xdelta.Program) {
 
         enc, err := t.Exec("encode", p, true, []string{"-e"})
         if err != nil {
-                fmt.Println(err)
                 t.Panic(err)
         }
         dec, err := t.Exec("decode", p, true, []string{"-d"})
         if err != nil {
-                fmt.Println(err)
                 t.Panic(err)
         }
 
@@ -234,7 +232,7 @@ func (cfg Config) offsetTest(t *xdelta.TestGroup, p xdelta.Program, offset, leng
 
         // The decoder output ("read", above) is compared with the
         // test-provided output ("write", below).  The following
-        // generates the input and output twice.
+        // generates two identical inputs.
         t.WriteRstreams("encode", seed, offset, length, enc.Srcin, enc.Stdin)
         t.WriteRstreams("decode", seed, offset, length, dec.Srcin, write)
         t.Wait(enc, dec)
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 }