test: tidy temp files and repin gjbt (#150)

Author: myitcv

.vendor.txt

@@ -18,7 +18,7 @@
     ./_vendor/src/github.com/russross/blackfriday            b253417e1cb644d645a0a3bb1fa5034c8030127c  git@github.com:russross/blackfriday
     ./_vendor/src/myitcv.io/highlightjs                      e0ea663591fbdbce10ca2658c680ba7be2391ff8  git@github.com:myitcv/highlightjs
     ./_vendor/src/myitcv.io/gogenerate                       99436ff35ff9bbe6e17d0b1e93d483d6b5d76528  git@github.com:myitcv/gogenerate
-    ./_vendor/src/myitcv.io/gjbt                             be7e0e99f0ce95b5027b241899b4ab3977839666  git@github.com:myitcv/gjbt.git
+    ./_vendor/src/myitcv.io/gjbt                             de4e64705c24cc39760110ae9bc4907a64ece3d7  git@github.com:myitcv/gjbt.git
     ./_vendor/src/myitcv.io/gg                               6081cb6439ba00f382553b2eadd85c5b3a577816  git@github.com:myitcv/gg
     ./_vendor/src/myitcv.io/remarkable                       6e8b85d04c0c2559fec23559cf88780db6d93083  git@github.com:myitcv/remarkable
     ./_vendor/src/myitcv.io/sorter                           b66c9061eedc0adeb2e46c786bc5a33de021fe24  git@github.com:myitcv/sorter

_vendor/src/myitcv.io/gjbt/main.go

@@ -29,7 +29,6 @@ var (
 )
 
 // TODO only works for Chrome for now
-
 // TODO support verbose mode in some way
 
 func main() {
@@ -106,50 +105,53 @@ func main() {
 	}
 
 	for _, pkg := range pkgs {
-		tf, err := ioutil.TempFile("", "")
-		if err != nil {
-			panic(err)
-		}
-
-		bpkg, err := build.Import(pkg, wd, build.FindOnly)
-		if err != nil {
-			panic(err)
-		}
-
-		args := []string{"test", "--tags", *fTags, "-c", "-o", tf.Name()}
+		func() {
+			tf, err := ioutil.TempFile("", "gjbt")
+			if err != nil {
+				panic(err)
+			}
+			defer func() {
+				n := tf.Name()
+				os.Remove(n)
+				os.Remove(n + ".map")
+			}()
+
+			bpkg, err := build.Import(pkg, wd, build.FindOnly)
+			if err != nil {
+				panic(err)
+			}
 
-		args = append(args, pkg)
+			args := []string{"test", "--tags", *fTags, "-c", "-o", tf.Name()}
 
-		cmd := exec.Command("gopherjs", args...)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
+			args = append(args, pkg)
 
-		err = cmd.Run()
-		if err != nil {
-			os.Remove(tf.Name())
-			fmt.Printf("%v\n", err)
-			failed = true
-			continue
-		}
+			cmd := exec.Command("gopherjs", args...)
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
 
-		test, err := ioutil.ReadFile(tf.Name())
-		if err != nil {
-			panic(err)
-		}
+			err = cmd.Run()
+			if err != nil {
+				fmt.Printf("%v\n", err)
+				failed = true
+				return
+			}
 
-		os.Remove(tf.Name())
+			test, err := ioutil.ReadFile(tf.Name())
+			if err != nil {
+				panic(err)
+			}
 
-		p, err := driver.NewPage()
-		if err != nil {
-			panic(err)
-		}
+			p, err := driver.NewPage()
+			if err != nil {
+				panic(err)
+			}
 
-		var ec res
+			var ec res
 
-		status := "ok  "
-		start := time.Now()
+			status := "ok  "
+			start := time.Now()
 
-		err = p.RunScript(`try {
+			err = p.RunScript(`try {
 			`+string(test)+`
 		}
 		catch (e) {
@@ -165,40 +167,41 @@ func main() {
 		};
 		return window.$GopherJSTestResult`, nil, &ec)
 
-		if err != nil {
-			panic(err)
-		}
+			if err != nil {
+				panic(err)
+			}
 
-		if ec.ExitCode != 0 {
-			status = "FAIL"
-			failed = true
-		}
+			if ec.ExitCode != 0 {
+				status = "FAIL"
+				failed = true
+			}
 
-		if ec.Error != "" {
-			fmt.Println(ec.Error)
-		}
-		fmt.Printf("%s\t%s\t%.3fs\n", status, bpkg.ImportPath, time.Since(start).Seconds())
+			if ec.Error != "" {
+				fmt.Println(ec.Error)
+			}
+			fmt.Printf("%s\t%s\t%.3fs\n", status, bpkg.ImportPath, time.Since(start).Seconds())
 
-		logs, err := p.ReadNewLogs("browser")
-		if err != nil {
-			panic(err)
-		}
+			logs, err := p.ReadNewLogs("browser")
+			if err != nil {
+				panic(err)
+			}
 
-		for _, l := range logs {
-			parts := strings.SplitN(l.Message, " ", 3)
+			for _, l := range logs {
+				parts := strings.SplitN(l.Message, " ", 3)
 
-			line := parts[2]
+				line := parts[2]
 
-			if strings.HasPrefix(line, "\"") && strings.HasSuffix(line, "\"") {
-				l, err := strconv.Unquote(parts[2])
-				if err != nil {
-					panic(err)
+				if strings.HasPrefix(line, "\"") && strings.HasSuffix(line, "\"") {
+					l, err := strconv.Unquote(parts[2])
+					if err != nil {
+						panic(err)
+					}
+					line = l
 				}
-				line = l
-			}
 
-			fmt.Println(line)
-		}
+				fmt.Println(line)
+			}
+		}()
 	}
 
 	if err := driver.Stop(); err != nil {

cmd/reactVet/reactVet_test.go

@@ -56,6 +56,11 @@ func strDiff(exp, act string) string {
 	actFn := mustTmpFile("", "").Name()
 	expFn := mustTmpFile("", "").Name()
 
+	defer func() {
+		os.Remove(actFn)
+		os.Remove(expFn)
+	}()
+
 	err := ioutil.WriteFile(actFn, []byte(act), 077)
 	if err != nil {
 		panic(err)