1 files changed, 13 insertions, 18 deletions
diff --git a/tools/nogo/check/main.go b/tools/nogo/check/main.go
index 69bdfe502..3a6c3fb08 100644
--- a/tools/nogo/check/main.go
+++ b/tools/nogo/check/main.go
@@ -24,6 +24,7 @@ import (
 	"os"
 
 	"gvisor.dev/gvisor/tools/nogo"
+	"gvisor.dev/gvisor/tools/worker"
 )
 
 var (
@@ -31,7 +32,6 @@ var (
 	stdlibFile     = flag.String("stdlib", "", "stdlib configuration file (in JSON format)")
 	findingsOutput = flag.String("findings", "", "output file (or stdout, if not specified)")
 	factsOutput    = flag.String("facts", "", "output file for facts (optional)")
-	escapesOutput  = flag.String("escapes", "", "output file for escapes (optional)")
 )
 
 func loadConfig(file string, config interface{}) interface{} {
@@ -50,9 +50,10 @@ func loadConfig(file string, config interface{}) interface{} {
 }
 
 func main() {
-	// Parse all flags.
-	flag.Parse()
+	worker.Work(run)
+}
 
+func run([]string) int {
 	var (
 		findings []nogo.Finding
 		factData []byte
@@ -66,25 +67,13 @@ func main() {
 
 	// Run the configuration.
 	if *stdlibFile != "" {
-		// Perform basic analysis.
+		// Perform stdlib analysis.
 		c := loadConfig(*stdlibFile, new(nogo.StdlibConfig)).(*nogo.StdlibConfig)
 		findings, factData, err = nogo.CheckStdlib(c, nogo.AllAnalyzers)
-
 	} else if *packageFile != "" {
-		// Perform basic analysis.
+		// Perform standard analysis.
 		c := loadConfig(*packageFile, new(nogo.PackageConfig)).(*nogo.PackageConfig)
 		findings, factData, err = nogo.CheckPackage(c, nogo.AllAnalyzers, nil)
-
-		// Do we need to do escape analysis?
-		if *escapesOutput != "" {
-			escapes, _, err := nogo.CheckPackage(c, nogo.EscapeAnalyzers, nil)
-			if err != nil {
-				log.Fatalf("error performing escape analysis: %v", err)
-			}
-			if err := nogo.WriteFindingsToFile(escapes, *escapesOutput); err != nil {
-				log.Fatalf("error writing escapes to %q: %v", *escapesOutput, err)
-			}
-		}
 	} else {
 		log.Fatalf("please provide at least one of package or stdlib!")
 	}
@@ -103,7 +92,11 @@ func main() {
 
 	// Write all findings.
 	if *findingsOutput != "" {
-		if err := nogo.WriteFindingsToFile(findings, *findingsOutput); err != nil {
+		w, err := os.OpenFile(*findingsOutput, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
+		if err != nil {
+			log.Fatalf("error opening output file %q: %v", *findingsOutput, err)
+		}
+		if err := nogo.WriteFindingsTo(w, findings, false /* json */); err != nil {
 			log.Fatalf("error writing findings to %q: %v", *findingsOutput, err)
 		}
 	} else {
@@ -111,4 +104,6 @@ func main() {
 			fmt.Fprintf(os.Stdout, "%s\n", finding.String())
 		}
 	}
+
+	return 0
 }