code review 40040044: test/run: make -v output look like go test output

test/run: make -v output look like go test output

Among other things, it makes it easier to scan to
see what is slow.

[rsc, 2013-12-10 16:56:38]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go/

[bradfitz, 2013-12-10 16:58:45]

LGTM
 On Dec 10, 2013 8:56 PM, <rsc@golang.org> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> test/run: make -v output look like go test output
>
> Among other things, it makes it easier to scan to
> see what is slow.
>
> Please review this at https://codereview.appspot.com/40040044/
>
> Affected files (+33, -16 lines):
>   M test/run.go
>
>
> Index: test/run.go
> ===================================================================
> --- a/test/run.go
> +++ b/test/run.go
> @@ -27,6 +27,7 @@
>         "sort"
>         "strconv"
>         "strings"
> +       "time"
>         "unicode"
>  )
>
> @@ -114,28 +115,39 @@
>         failed := false
>         resCount := map[string]int{}
>         for _, test := range tests {
> -               <-test.donec
> -               _, isSkip := test.err.(skipError)
> -               errStr := "pass"
> -               if test.err != nil {
> -                       errStr = test.err.Error()
> -                       if !isSkip {
> -                               failed = true
> +               <-test.donec
> +               status := "ok  "
> +               errStr := ""
> +               if _, isSkip := test.err.(skipError); isSkip {
> +                       status = "skip"
> +                       test.err = nil
> +                       if !skipOkay[path.Join(test.dir, test.gofile)] {
> +                               errStr = "unexpected skip for " +
> path.Join(test.dir, test.gofile) + ": " + errStr
> +                               status = "FAIL"
>                         }
>                 }
> -               if isSkip && !skipOkay[path.Join(test.dir, test.gofile)] {
> -                       errStr = "unexpected skip for " +
> path.Join(test.dir, test.gofile) + ": " + errStr
> -                       isSkip = false
> +               if test.err != nil {
> +                       status = "FAIL"
> +                       errStr = test.err.Error()
> +               }
> +               if status == "FAIL" {
>                         failed = true
>                 }
> -               resCount[errStr]++
> -               if isSkip && !*verbose && !*showSkips {
> +               resCount[status]++
> +               if status == "skip" && !*verbose && !*showSkips {
>                         continue
>                 }
> -               if !*verbose && test.err == nil {
> +               dt := fmt.Sprintf("%.3fs", test.dt.Seconds())
> +               if status == "FAIL" {
> +                       fmt.Printf("# go run run.go --
> %s\n%s\nFAIL\t%s\t%s\n",
> +                               path.Join(test.dir, test.gofile),
> +                               errStr, test.goFileName(), dt)
>                         continue
>                 }
> -               fmt.Printf("# go run run.go -- %s\n%-20s %-20s: %s\n",
> path.Join(test.dir, test.gofile), test.action, test.goFileName(), errStr)
> +               if !*verbose {
> +                       continue
> +               }
> +               fmt.Printf("%s\t%s\t%s\n", status, test.goFileName(), dt)
>         }
>
>         if *summary {
> @@ -207,7 +219,8 @@
>  type test struct {
>         dir, gofile string
>         donec       chan bool // closed when done
> -
> +       dt time.Duration
> +
>         src    string
>         action string // "compile", "build", etc.
>
> @@ -379,7 +392,11 @@
>
>  // run runs a test.
>  func (t *test) run() {
> -       defer close(t.donec)
> +       start := time.Now()
> +       defer func() {
> +               t.dt = time.Since(start)
> +               close(t.donec)
> +       }()
>
>         srcBytes, err := ioutil.ReadFile(t.goFileName())
>         if err != nil {
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-dev+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>

[rsc, 2013-12-10 19:02:46]

*** Submitted as https://code.google.com/p/go/source/detail?r=58c441bb934d ***

test/run: make -v output look like go test output

Among other things, it makes it easier to scan to
see what is slow.

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/40040044