From f2ecbd518f85e83548c8251b7a150543d54d12f0 Mon Sep 17 00:00:00 2001 From: Jonathan Hall Date: Sat, 17 Oct 2015 20:26:59 +0200 Subject: [PATCH] Call JsFilesFromDir in the case of 'gopherjs test' as well. --- build/build.go | 6 +++--- tool.go | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/build.go b/build/build.go index 2263638d0..a5f4983dc 100644 --- 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 index 0f1632b22..db7c6c859 100644 --- 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 }