code review 4272066: testing: add -cpu.profile flag

src/pkg/testing/testing.go

 // Copyright 2009 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.
 
 // The testing package provides support for automated testing of Go packages.
 // It is intended to be used in concert with the ``gotest'' utility, which automates
 // execution of any function of the form
 //     func TestXxx(*testing.T)
 // where Xxx can be any alphanumeric string (but the first letter must not be in
 // [a-z]) and serves to identify the test routine.
@@ skipping 35 matching lines @@
         "runtime/pprof"
         "time"
 )
 
 var (
         // Report as tests are run; default is silent for success.
         chatty         = flag.Bool("test.v", false, "verbose: print additional output")
         match          = flag.String("test.run", "", "regular expression to select tests to run")
         memProfile     = flag.String("test.memprofile", "", "write a memory profile to the named file after execution")
         memProfileRate = flag.Int("test.memprofilerate", 0, "if >=0, sets runtime.MemProfileRate")
         cpuProfile     = flag.String("test.cpuprofile", "", "write a cpu profile to the named file during execution")

[r, 2011/03/23 19:39:16]

the CL says -cpu.profile. please update the CL description.

 )
 
 
 // Insert final newline if needed and tabs after internal newlines.
 func tabify(s string) string {
         n := len(s)
         if n > 0 && s[n-1] != '\n' {
                 s += "\n"
                 n++
         }
@@ skipping 72 matching lines @@
         test.F(t)
         t.ch <- t
 }
 
 // An internal function but exported because it is cross-package; part of the implementation
 // of gotest.
 func Main(matchString func(pat, str string) (bool, os.Error), tests []InternalTest, benchmarks []InternalBenchmark) {
         flag.Parse()
 
         before()
+        RunTests(matchString, tests)
+        RunBenchmarks(matchString, benchmarks)
+        after()
+}
+
+func RunTests(matchString func(pat, str string) (bool, os.Error), tests []InternalTest) {
         ok := true
         if len(tests) == 0 {

[r, 2011/03/23 19:39:16]

it's just cosmetic but at this point i'd refactor into RunTests and do
before()
RunTests()
RunBenchmarks()
after()

                 println("testing: warning: no tests to run")
         }
         for i := 0; i < len(tests); i++ {
                 matched, err := matchString(*match, tests[i].Name)
                 if err != nil {
                         println("invalid regexp for -test.run:", err.String())
                         os.Exit(1)
                 }
                 if !matched {
                         continue
@@ skipping 15 matching lines @@
                 } else if *chatty {
                         println("--- PASS:", tests[i].Name, tstr)
                         print(t.errors)
                 }
         }
         if !ok {
                 println("FAIL")
                 os.Exit(1)
         }
         println("PASS")
-        RunBenchmarks(matchString, benchmarks)
-        after()
 }
 
 // before runs before all testing.
 func before() {
         if *memProfileRate > 0 {
                 runtime.MemProfileRate = *memProfileRate
         }
         if *cpuProfile != "" {
                 f, err := os.Open(*cpuProfile, os.O_WRONLY|os.O_CREAT|os.O_TRUNC, 0666)
                 if err != nil {
@@ skipping 20 matching lines @@
                 if err != nil {
                         fmt.Fprintf(os.Stderr, "testing: %s", err)
                         return
                 }
                 if err = pprof.WriteHeapProfile(f); err != nil {
                         fmt.Fprintf(os.Stderr, "testing: can't write %s: %s", *memProfile, err)
                 }
                 f.Close()
         }
 }