Have "wuffs gen" and "wuffs test" do genrelease

This commit is contained in:
Nigel Tao committed 2018-07-14 09:54:02 +10:00
1 parent f2e683ab69
commit b70bb379d8
3 files changed
+35 -15

No files matched your search

+2 -1
View File
@@ -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 {
+5 -2
View File
@@ -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
+28 -12
View File
@@ -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.