mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Add a -ccompilers flag.
This commit is contained in:
1 parent
2ec0cc1db9
commit
b3c7360907
5 files changed
+51
-13
No files matched your search
@@ -25,6 +25,7 @@ import (
|
||||
|
||||
func doGenlib(args []string) error {
|
||||
flags := flag.FlagSet{}
|
||||
ccompilersFlag := flags.String("ccompilers", ccompilersDefault, ccompilersUsage)
|
||||
dstdirFlag := flags.String("dstdir", "", "directory containing the object files ")
|
||||
srcdirFlag := flags.String("srcdir", "", "directory containing the C source files")
|
||||
if err := flags.Parse(args); err != nil {
|
||||
@@ -39,7 +40,12 @@ func doGenlib(args []string) error {
|
||||
return fmt.Errorf("empty -srcdir flag")
|
||||
}
|
||||
|
||||
for _, cc := range []string{"clang", "gcc"} {
|
||||
for _, cc := range strings.Split(*ccompilersFlag, ",") {
|
||||
cc = strings.TrimSpace(cc)
|
||||
if cc == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
for _, dynamism := range []string{"static", "dynamic"} {
|
||||
outDir := filepath.Join(*dstdirFlag, cc+"-"+dynamism)
|
||||
if err := os.MkdirAll(outDir, 0755); err != nil {
|
||||
|
||||
@@ -46,3 +46,8 @@ func main1() error {
|
||||
}
|
||||
return fmt.Errorf("bad sub-command %q", os.Args[1])
|
||||
}
|
||||
|
||||
const (
|
||||
ccompilersDefault = "clang,gcc"
|
||||
ccompilersUsage = `comma-separated list of C compilers, e.g. "clang,gcc"`
|
||||
)
|
||||
+9
-3
@@ -40,6 +40,7 @@ func doBenchTest(args []string, bench bool) error {
|
||||
)
|
||||
|
||||
flags := flag.FlagSet{}
|
||||
ccompilersFlag := flags.String("ccompilers", ccompilersDefault, ccompilersUsage)
|
||||
mimicFlag := flags.Bool("mimic", mimicDefault, mimicUsage)
|
||||
repsFlag := flags.Int("reps", repsDefault, repsUsage)
|
||||
if err := flags.Parse(args); err != nil {
|
||||
@@ -53,7 +54,7 @@ func doBenchTest(args []string, bench bool) error {
|
||||
|
||||
failed := false
|
||||
for _, arg := range args {
|
||||
f, err := doBenchTest1(arg, bench, *mimicFlag, *repsFlag)
|
||||
f, err := doBenchTest1(arg, bench, *ccompilersFlag, *mimicFlag, *repsFlag)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -69,7 +70,7 @@ func doBenchTest(args []string, bench bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func doBenchTest1(filename string, bench bool, mimic bool, reps int) (failed bool, err error) {
|
||||
func doBenchTest1(filename string, bench bool, ccompilers string, mimic bool, reps int) (failed bool, err error) {
|
||||
workDir, err := ioutil.TempDir("", "puffs-c")
|
||||
if err != nil {
|
||||
return false, err
|
||||
@@ -95,7 +96,12 @@ func doBenchTest1(filename string, bench bool, mimic bool, reps int) (failed boo
|
||||
ccArgs = append(ccArgs, extra...)
|
||||
}
|
||||
|
||||
for _, cc := range []string{"clang", "gcc"} {
|
||||
for _, cc := range strings.Split(ccompilers, ",") {
|
||||
cc = strings.TrimSpace(cc)
|
||||
if cc == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
ccCmd := exec.Command(cc, ccArgs...)
|
||||
ccCmd.Stdout = os.Stdout
|
||||
ccCmd.Stderr = os.Stderr
|
||||
|
||||
@@ -118,6 +118,9 @@ func listDir(puffsRoot string, dirname string, returnSubdirs bool) (filenames []
|
||||
}
|
||||
|
||||
const (
|
||||
ccompilersDefault = "clang,gcc"
|
||||
ccompilersUsage = `comma-separated list of C compilers, e.g. "clang,gcc"`
|
||||
|
||||
langsDefault = "c"
|
||||
langsUsage = `comma-separated list of target languages (file extensions), e.g. "c,go,rs"`
|
||||
|
||||
|
||||
+27
-9
@@ -28,6 +28,7 @@ func doTest(puffsRoot string, args []string) error { return doBenchTest(puffsRo
|
||||
|
||||
func doBenchTest(puffsRoot string, args []string, bench bool) error {
|
||||
flags := flag.NewFlagSet("test", flag.ExitOnError)
|
||||
ccompilersFlag := flags.String("ccompilers", ccompilersDefault, ccompilersUsage)
|
||||
langsFlag := flags.String("langs", langsDefault, langsUsage)
|
||||
mimicFlag := flags.Bool("mimic", mimicDefault, mimicUsage)
|
||||
repsFlag := flags.Int("reps", repsDefault, repsUsage)
|
||||
@@ -56,6 +57,13 @@ func doBenchTest(puffsRoot string, args []string, bench bool) error {
|
||||
cmdArgs = append(cmdArgs, "-mimic")
|
||||
}
|
||||
|
||||
b := btHelper{
|
||||
puffsRoot: puffsRoot,
|
||||
langs: langs,
|
||||
cmdArgs: cmdArgs,
|
||||
ccompilers: *ccompilersFlag,
|
||||
}
|
||||
|
||||
failed := false
|
||||
for _, arg := range args {
|
||||
recursive := strings.HasSuffix(arg, "/...")
|
||||
@@ -69,7 +77,7 @@ func doBenchTest(puffsRoot string, args []string, bench bool) error {
|
||||
}
|
||||
|
||||
// Proceed with benching / testing the generated code.
|
||||
f, err := benchTest(puffsRoot, arg, langs, cmdArgs, recursive)
|
||||
f, err := b.benchTest(arg, recursive)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -85,13 +93,20 @@ func doBenchTest(puffsRoot string, args []string, bench bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func benchTest(puffsRoot, dirname string, langs []string, cmdArgs []string, recursive bool) (failed bool, err error) {
|
||||
filenames, dirnames, err := listDir(puffsRoot, dirname, recursive)
|
||||
type btHelper struct {
|
||||
puffsRoot string
|
||||
langs []string
|
||||
cmdArgs []string
|
||||
ccompilers string
|
||||
}
|
||||
|
||||
func (b *btHelper) benchTest(dirname string, recursive bool) (failed bool, err error) {
|
||||
filenames, dirnames, err := listDir(b.puffsRoot, dirname, recursive)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if len(filenames) > 0 {
|
||||
f, err := benchTestDir(puffsRoot, dirname, langs, cmdArgs)
|
||||
f, err := b.benchTestDir(dirname)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -99,7 +114,7 @@ func benchTest(puffsRoot, dirname string, langs []string, cmdArgs []string, recu
|
||||
}
|
||||
if len(dirnames) > 0 {
|
||||
for _, d := range dirnames {
|
||||
f, err := benchTest(puffsRoot, filepath.Join(dirname, d), langs, cmdArgs, recursive)
|
||||
f, err := b.benchTest(filepath.Join(dirname, d), recursive)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -109,16 +124,19 @@ func benchTest(puffsRoot, dirname string, langs []string, cmdArgs []string, recu
|
||||
return failed, nil
|
||||
}
|
||||
|
||||
func benchTestDir(puffsRoot string, dirname string, langs []string, cmdArgs []string) (failed bool, err error) {
|
||||
func (b *btHelper) benchTestDir(dirname string) (failed bool, err error) {
|
||||
if packageName := filepath.Base(dirname); !validName(packageName) {
|
||||
return false, fmt.Errorf(`invalid package %q, not in [a-z0-9]+`, packageName)
|
||||
}
|
||||
|
||||
for _, lang := range langs {
|
||||
for _, lang := range b.langs {
|
||||
command := "puffs-" + lang
|
||||
args := []string(nil)
|
||||
args = append(args, cmdArgs...)
|
||||
args = append(args, filepath.Join(puffsRoot, "test", lang, filepath.FromSlash(dirname)))
|
||||
args = append(args, b.cmdArgs...)
|
||||
if lang == "c" {
|
||||
args = append(args, "-ccompilers", b.ccompilers)
|
||||
}
|
||||
args = append(args, filepath.Join(b.puffsRoot, "test", lang, filepath.FromSlash(dirname)))
|
||||
cmd := exec.Command(command, args...)
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
Reference in new issue
Block a user