Call JsFilesFromDir in the case of 'gopherjs test' as well.

flimzy · flimzy · commit f2ecbd518f85 · 2015-10-17T20:33:44.000+02:00
diff --git a/build/build.go b/build/build.go
@@ -309,7 +309,7 @@ func (s *Session) BuildDir(packagePath string, importPath string, pkgObj string)
 	}
 	pkg := &PackageData{Package: buildPkg}
 	pkg.ImportPath = "main"
-	jsFiles, err := jsFilesFromDir(pkg.Dir)
+	jsFiles, err := JsFilesFromDir(pkg.Dir)
 	if err != nil {
 		return err
 	}
@@ -366,7 +366,7 @@ func (s *Session) ImportPackage(path string) (*compiler.Archive, error) {
 	}
 	pkg := &PackageData{Package: buildPkg}
 
-	jsFiles, err := jsFilesFromDir(pkg.Dir)
+	jsFiles, err := JsFilesFromDir(pkg.Dir)
 	if err != nil {
 		return nil, err
 	}
@@ -575,7 +575,7 @@ func NewMappingCallback(m *sourcemap.Map, goroot, gopath string) func(generatedL
 	}
 }
 
-func jsFilesFromDir(dir string) ([]string, error) {
+func JsFilesFromDir(dir string) ([]string, error) {
 	files, err := ioutil.ReadDir(dir)
 	if err != nil {
 		return nil, err
diff --git a/tool.go b/tool.go
@@ -299,6 +299,11 @@ func main() {
 				tests := &testFuncs{Package: pkg}
 				collectTests := func(buildPkg *build.Package, testPkgName string, needVar *bool) error {
 					testPkg := &gbuild.PackageData{Package: buildPkg, IsTest: true}
+					jsFiles, err := gbuild.JsFilesFromDir(pkg.Dir)
+					if err != nil {
+						return err
+					}
+					testPkg.JsFiles = jsFiles
 					if err := s.BuildPackage(testPkg); err != nil {
 						return err
 					}

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ func (s *Session) BuildDir(packagePath string, importPath string, pkgObj string)`
`309`	`309`	`}`
`310`	`310`	`pkg := &PackageData{Package: buildPkg}`
`311`	`311`	`pkg.ImportPath = "main"`
`312`		`- jsFiles, err := jsFilesFromDir(pkg.Dir)`
	`312`	`+ jsFiles, err := JsFilesFromDir(pkg.Dir)`
`313`	`313`	`if err != nil {`
`314`	`314`	`return err`
`315`	`315`	`}`
`@@ -366,7 +366,7 @@ func (s Session) ImportPackage(path string) (compiler.Archive, error) {`
`366`	`366`	`}`
`367`	`367`	`pkg := &PackageData{Package: buildPkg}`
`368`	`368`
`369`		`- jsFiles, err := jsFilesFromDir(pkg.Dir)`
	`369`	`+ jsFiles, err := JsFilesFromDir(pkg.Dir)`
`370`	`370`	`if err != nil {`
`371`	`371`	`return nil, err`
`372`	`372`	`}`
`@@ -575,7 +575,7 @@ func NewMappingCallback(m *sourcemap.Map, goroot, gopath string) func(generatedL`
`575`	`575`	`}`
`576`	`576`	`}`
`577`	`577`
`578`		`-func jsFilesFromDir(dir string) ([]string, error) {`
	`578`	`+func JsFilesFromDir(dir string) ([]string, error) {`
`579`	`579`	`files, err := ioutil.ReadDir(dir)`
`580`	`580`	`if err != nil {`
`581`	`581`	`return nil, err`