code review 7310066: runtime/race: deflake tests

runtime/race: deflake tests
With the new scheduler races in the tests are reported during execution of other tests.
The change joins goroutines started during the tests.

[dvyukov, 2013-02-08 13:54:41]

Hello golang-dev@googlegroups.com,

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

[bradfitz, 2013-02-08 15:18:42]

LGTM
 On Feb 8, 2013 5:54 AM, <dvyukov@google.com> wrote:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
>
https://dvyukov%40google.com@**code.google.com/p/go/<http://40google.com@code...
>
>
> Description:
> runtime/race: deflake tests
> With the new scheduler races in the tests are reported during execution
> of other tests.
> The change joins goroutines started during the tests.
>
> Please review this at
https://codereview.appspot.**com/7310066/<https://codereview.appspot.com/7310...
>
> Affected files:
>   M src/pkg/runtime/race/testdata/**mop_test.go
>   M src/pkg/runtime/race/testdata/**regression_test.go
>
>
> Index: src/pkg/runtime/race/testdata/**mop_test.go
> ==============================**==============================**=======
> --- a/src/pkg/runtime/race/**testdata/mop_test.go
> +++ b/src/pkg/runtime/race/**testdata/mop_test.go
> @@ -745,7 +745,8 @@
>         url := "dummyurl"
>         depth := 3
>         seen := make(map[string]bool)
> -       ch := make(chan int)
> +       ch := make(chan int, 100)
> +       var wg sync.WaitGroup
>         var crawl func(string, int)
>         crawl = func(u string, d int) {
>                 nurl := 0
> @@ -759,12 +760,16 @@
>                 urls := [...]string{"a", "b", "c"}
>                 for _, uu := range urls {
>                         if _, ok := seen[uu]; !ok {
> +                               wg.Add(1)
>                                 go crawl(uu, d-1)
>                                 nurl++
>                         }
>                 }
> +               wg.Done()
>         }
> +       wg.Add(1)
>         go crawl(url, depth)
> +       wg.Wait()
>  }
>
>  func TestRaceIndirection(t *testing.T) {
> Index: src/pkg/runtime/race/testdata/**regression_test.go
> ==============================**==============================**=======
> --- a/src/pkg/runtime/race/**testdata/regression_test.go
> +++ b/src/pkg/runtime/race/**testdata/regression_test.go
> @@ -15,10 +15,13 @@
>  }
>
>  func NewLog() (l LogImpl) {
> +       c := make(chan bool)
>         go func() {
>                 _ = l
> +               c <- true
>         }()
>         l = LogImpl{}
> +       <-c
>         return
>  }
>
>
>
> --
>
> ---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<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>
>
>

[dvyukov, 2013-02-08 15:26:16]

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

runtime/race: deflake tests
With the new scheduler races in the tests are reported during execution of other
tests.
The change joins goroutines started during the tests.

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