code review 5869049: test: use testlib in a few more cases (part 2)

test/run.go

 // skip
 
 // Copyright 2012 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.
 
 // Run runs tests in the test directory.
 //·
 // TODO(bradfitz): docs of some sort, once we figure out how we're changing
 // headers of files
@@ skipping 154 matching lines @@
                 log.Fatal(err)
         }
 }
 
 // test holds the state of a test.
 type test struct {
         dir, gofile string
         donec       chan bool // closed when done
 
         src    string
-        action string // "compile", "build", "run", "errorcheck", "skip", "run|run"
+        action string // "compile", "build", "run", "errorcheck", "skip", "runoutput"
 
         tempDir string
         err     error
 }
 
 // startTest·
 func startTest(dir, gofile string) *test {
         t := &test{
                 dir:    dir,
                 gofile: gofile,
@@ skipping 58 matching lines @@
         f := strings.Fields(action)
         if len(f) > 0 {
                 action = f[0]
                 args = f[1:]
         }
 
         switch action {
         case "cmpout":
                 action = "run" // the run case already looks for <dir>/<test>.out files
                 fallthrough
-        case "compile", "build", "run", "errorcheck", "run|run":
+        case "compile", "build", "run", "errorcheck", "runoutput":
                 t.action = action
         case "skip":
                 t.action = "skip"
                 return
         default:
                 t.err = skipError("skipped; unknown pattern: " + action)
                 t.action = "??"
                 return
         }
 
@@ skipping 45 matching lines @@
         case "run":
                 useTmp = false
                 out, err := runcmd(append([]string{"go", "run", t.goFileName()}, args...)...)
                 if err != nil {
                         t.err = fmt.Errorf("%s\n%s", err, out)
                 }
                 if string(out) != t.expectedOutput() {
                         t.err = fmt.Errorf("incorrect output\n%s", out)
                 }
 
-        case "run|run":
+        case "runoutput":
                 useTmp = false
                 out, err := runcmd("go", "run", t.goFileName())
                 if err != nil {
                         t.err = fmt.Errorf("%s\n%s", err, out)
                 }
                 tfile := filepath.Join(t.tempDir, "tmp__.go")
                 err = ioutil.WriteFile(tfile, out, 0666)
                 if err != nil {
                         t.err = fmt.Errorf("write tempfile:%s", err)
                         return
@@ skipping 145 matching lines @@
                                 re:       regexp.MustCompile(rx),
                                 filterRe: regexp.MustCompile(filterPattern),
                                 lineNum:  lineNum,
                                 file:     t.gofile,
                         })
                 }
         }
 
         return
 }