Re-order logic to give TestMain-specific error messages precedence

flimzy · flimzy · commit 6c270aebfb43 · 2016-05-15T12:39:22.000+02:00
diff --git a/tool.go b/tool.go
@@ -334,10 +334,6 @@ func main() {
 
 				tests := &testFuncs{Package: pkg.Package}
 				collectTests := func(testPkg *gbuild.PackageData, testPkgName string, needVar *bool) error {
-					_, err := s.BuildPackage(testPkg)
-					if err != nil {
-						return err
-					}
 					if testPkgName == "_test" {
 						for _, file := range pkg.TestGoFiles {
 							if err := tests.load(filepath.Join(pkg.Package.Dir, file), testPkgName, &tests.ImportTest, &tests.NeedTest); err != nil {
@@ -351,6 +347,10 @@ func main() {
 							}
 						}
 					}
+					_, err := s.BuildPackage(testPkg)
+					if err != nil {
+						return err
+					}
 					return nil
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -334,10 +334,6 @@ func main() {`
`334`	`334`
`335`	`335`	`tests := &testFuncs{Package: pkg.Package}`
`336`	`336`	`collectTests := func(testPkg gbuild.PackageData, testPkgName string, needVar bool) error {`
`337`		`- _, err := s.BuildPackage(testPkg)`
`338`		`- if err != nil {`
`339`		`- return err`
`340`		`- }`
`341`	`337`	`if testPkgName == "_test" {`
`342`	`338`	`for _, file := range pkg.TestGoFiles {`
`343`	`339`	`if err := tests.load(filepath.Join(pkg.Package.Dir, file), testPkgName, &tests.ImportTest, &tests.NeedTest); err != nil {`
`@@ -351,6 +347,10 @@ func main() {`
`351`	`347`	`}`
`352`	`348`	`}`
`353`	`349`	`}`
	`350`	`+ _, err := s.BuildPackage(testPkg)`
	`351`	`+ if err != nil {`
	`352`	`+ return err`
	`353`	`+ }`
`354`	`354`	`return nil`
`355`	`355`	`}`
`356`	`356`