From b70bb379d808aa9b332c687a55e2366a56408c74 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 14 Jul 2018 09:54:02 +1000 Subject: [PATCH] Have "wuffs gen" and "wuffs test" do genrelease --- cmd/wuffs/gen.go | 3 ++- cmd/wuffs/release.go | 7 +++++-- cmd/wuffs/test.go | 40 ++++++++++++++++++++++++++++------------ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index 89024689..bfb519c9 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -72,6 +72,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { if arg == "" { continue } + if err := h.gen(arg, recursive); err != nil { return err } @@ -80,7 +81,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { if genlib { return h.genlibAffected() } - return nil + return doGenrelease1(wuffsRoot, langs, cf.Version{}) } type genHelper struct { diff --git a/cmd/wuffs/release.go b/cmd/wuffs/release.go index d3230d0d..66253016 100644 --- a/cmd/wuffs/release.go +++ b/cmd/wuffs/release.go @@ -54,7 +54,10 @@ func doGenrelease(wuffsRoot string, args []string) error { return err } } + return doGenrelease1(wuffsRoot, langs, v) +} +func doGenrelease1(wuffsRoot string, langs []string, v cf.Version) error { revision := findRevision(wuffsRoot) for _, lang := range langs { suffix := lang @@ -62,7 +65,7 @@ func doGenrelease(wuffsRoot string, args []string) error { suffix = "h" } - filename, contents, err := doGenrelease1(wuffsRoot, revision, v, lang, suffix) + filename, contents, err := doGenrelease2(wuffsRoot, revision, v, lang, suffix) if err != nil { return err } @@ -73,7 +76,7 @@ func doGenrelease(wuffsRoot string, args []string) error { return nil } -func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) { +func doGenrelease2(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) { qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+suffix) if err != nil { return "", nil, err diff --git a/cmd/wuffs/test.go b/cmd/wuffs/test.go index cea2280c..e1ee7ebe 100644 --- a/cmd/wuffs/test.go +++ b/cmd/wuffs/test.go @@ -94,24 +94,40 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error { ccompilers: *ccompilersFlag, } + // Ensure that we are testing the latest version of the generated code. + if !*skipgenFlag { + gh := genHelper{ + wuffsRoot: wuffsRoot, + langs: langs, + cformatter: *cformatterFlag, + skipgendeps: *skipgendepsFlag, + } + for _, arg := range args { + recursive := strings.HasSuffix(arg, "/...") + if recursive { + arg = arg[:len(arg)-4] + } + if arg == "" { + continue + } + + if err := gh.gen(arg, recursive); err != nil { + return err + } + } + if err := doGenrelease1(wuffsRoot, langs, cf.Version{}); err != nil { + return err + } + } + failed := false for _, arg := range args { recursive := strings.HasSuffix(arg, "/...") if recursive { arg = arg[:len(arg)-4] } - - // Ensure that we are testing the latest version of the generated code. - if !*skipgenFlag { - gh := genHelper{ - wuffsRoot: wuffsRoot, - langs: langs, - cformatter: *cformatterFlag, - skipgendeps: *skipgendepsFlag, - } - if err := gh.gen(arg, recursive); err != nil { - return err - } + if arg == "" { + continue } // Proceed with benching / testing the generated code.