code review 9149045: cmd/api: add more platforms

src/cmd/api/goapi.go

 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Api computes the exported API of a set of Go packages.
 //
 // BUG(bradfitz): Note that this tool is only currently suitable
 // for use on the Go standard library, not arbitrary packages.
 // Once the Go AST has type information, this tool will be more
 // reliable without hard-coded hacks throughout.
@@ skipping 20 matching lines @@
         "path/filepath"
         "regexp"
         "runtime"
         "sort"
         "strconv"
         "strings"
 )
 
 // Flags
 var (
-        // TODO(bradfitz): once Go 1.1 comes out, allow the -c flag to take a comma-separated
-        // list of files, rather than just one.
-        checkFile  = flag.String("c", "", "optional filename to check API against")
+        checkFile  = flag.String("c", "", "optional comma-separated filename(s) to check API against")
         allowNew   = flag.Bool("allow_new", true, "allow API additions")
         exceptFile = flag.String("except", "", "optional filename of packages that are allowed to change without triggering a failure in the tool")
         nextFile   = flag.String("next", "", "optional filename of tentative upcoming API features for the next release. This file can be lazily maintained. It only affects the delta warnings from the -c file printed on success.")
         verbose    = flag.Bool("v", false, "verbose debugging")
         forceCtx   = flag.String("contexts", "", "optional comma-separated list of <goos>-<goarch>[-cgo] to override default contexts.")
 )
 
 // contexts are the default contexts which are scanned, unless
 // overridden by the -contexts flag.
 var contexts = []*build.Context{
@@ skipping 18 matching lines @@
         {GOOS: "netbsd", GOARCH: "386", CgoEnabled: true},
         {GOOS: "netbsd", GOARCH: "386"},
         {GOOS: "netbsd", GOARCH: "amd64", CgoEnabled: true},
         {GOOS: "netbsd", GOARCH: "amd64"},
         {GOOS: "netbsd", GOARCH: "arm", CgoEnabled: true},
         {GOOS: "netbsd", GOARCH: "arm"},
         {GOOS: "openbsd", GOARCH: "386", CgoEnabled: true},
         {GOOS: "openbsd", GOARCH: "386"},
         {GOOS: "openbsd", GOARCH: "amd64", CgoEnabled: true},
         {GOOS: "openbsd", GOARCH: "amd64"},
-        {GOOS: "openbsd", GOARCH: "arm", CgoEnabled: true},
-        {GOOS: "openbsd", GOARCH: "arm"},
 }
 
 func contextName(c *build.Context) string {
         s := c.GOOS + "-" + c.GOARCH
         if c.CgoEnabled {
                 return s + "-cgo"
         }
         return s
 }
 
@@ skipping 102 matching lines @@
         defer bw.Flush()
 
         if *checkFile == "" {
                 sort.Strings(features)
                 for _, f := range features {
                         fmt.Fprintf(bw, "%s\n", f)
                 }
                 return
         }
 
-        required := fileFeatures(*checkFile)
+        var required []string
+        for _, file := range strings.Split(*checkFile, ",") {
+                required = append(required, fileFeatures(file)...)
+        }
         optional := fileFeatures(*nextFile)
         exception := fileFeatures(*exceptFile)
         fail = !compareAPI(bw, features, required, optional, exception)
 }
 
 func set(items []string) map[string]bool {
         s := make(map[string]bool)
         for _, v := range items {
                 s[v] = true
         }
@@ skipping 23 matching lines @@
                 s := (*sl)[0]
                 *sl = (*sl)[1:]
                 return s
         }
 
         for len(required) > 0 || len(features) > 0 {
                 switch {
                 case len(features) == 0 || (len(required) > 0 && required[0] < features[0]):
                         feature := take(&required)
                         if exceptionSet[feature] {
-                                fmt.Fprintf(w, "~%s\n", feature)
+                                // An "unfortunate" case: the feature was once
+                                // included in the API (e.g. go1.txt), but was
+                                // subsequently removed. These are already
+                                // acknowledged by being in the file
+                                // "api/except.txt". No need to print them out
+                                // here.
                         } else if featureSet[featureWithoutContext(feature)] {
                                 // okay.
                         } else {
                                 fmt.Fprintf(w, "-%s\n", feature)
                                 ok = false // broke compatibility
                         }
                 case len(required) == 0 || (len(features) > 0 && required[0] > features[0]):
                         newFeature := take(&features)
                         if optionalSet[newFeature] {
                                 // Known added feature to the upcoming release.
@@ skipping 930 matching lines @@
 }
 
 func strListContains(l []string, s string) bool {
         for _, v := range l {
                 if v == s {
                         return true
                 }
         }
         return false
 }