| Peter Collingbourne | 93c73eb | 2015-04-05 23:30:42 +0000 | [diff] [blame] | 1 | diff -r a6e10414311a libgo/Makefile.am |
| 2 | --- a/libgo/Makefile.am Fri Jan 16 07:57:02 2015 -0800 |
| 3 | +++ b/libgo/Makefile.am Fri Apr 03 15:07:47 2015 -0700 |
| 4 | @@ -3738,7 +3738,6 @@ |
| Andrew Wilkins | d07b2b4 | 2015-03-06 02:49:07 +0000 | [diff] [blame] | 5 | os/check \ |
| 6 | path/check \ |
| 7 | reflect/check \ |
| 8 | - regexp/check \ |
| 9 | runtime/check \ |
| 10 | sort/check \ |
| 11 | strconv/check \ |
| Peter Collingbourne | 93c73eb | 2015-04-05 23:30:42 +0000 | [diff] [blame] | 12 | @@ -3838,7 +3837,6 @@ |
| Andrew Wilkins | d07b2b4 | 2015-03-06 02:49:07 +0000 | [diff] [blame] | 13 | os/user/check \ |
| 14 | path/filepath/check \ |
| 15 | regexp/syntax/check \ |
| 16 | - runtime/pprof/check \ |
| 17 | sync/atomic/check \ |
| 18 | text/scanner/check \ |
| 19 | text/tabwriter/check \ |
| Peter Collingbourne | 93c73eb | 2015-04-05 23:30:42 +0000 | [diff] [blame] | 20 | diff -r a6e10414311a libgo/Makefile.in |
| 21 | --- a/libgo/Makefile.in Fri Jan 16 07:57:02 2015 -0800 |
| 22 | +++ b/libgo/Makefile.in Fri Apr 03 15:07:47 2015 -0700 |
| 23 | @@ -2212,7 +2212,6 @@ |
| Andrew Wilkins | d07b2b4 | 2015-03-06 02:49:07 +0000 | [diff] [blame] | 24 | os/check \ |
| 25 | path/check \ |
| 26 | reflect/check \ |
| 27 | - regexp/check \ |
| 28 | runtime/check \ |
| 29 | sort/check \ |
| 30 | strconv/check \ |
| Peter Collingbourne | 93c73eb | 2015-04-05 23:30:42 +0000 | [diff] [blame] | 31 | @@ -2312,7 +2311,6 @@ |
| Andrew Wilkins | d07b2b4 | 2015-03-06 02:49:07 +0000 | [diff] [blame] | 32 | os/user/check \ |
| 33 | path/filepath/check \ |
| 34 | regexp/syntax/check \ |
| 35 | - runtime/pprof/check \ |
| 36 | sync/atomic/check \ |
| 37 | text/scanner/check \ |
| 38 | text/tabwriter/check \ |
| Peter Collingbourne | 93c73eb | 2015-04-05 23:30:42 +0000 | [diff] [blame] | 39 | diff -r a6e10414311a libgo/go/runtime/mfinal_test.go |
| 40 | --- a/libgo/go/runtime/mfinal_test.go Fri Jan 16 07:57:02 2015 -0800 |
| 41 | +++ b/libgo/go/runtime/mfinal_test.go Fri Apr 03 15:07:47 2015 -0700 |
| 42 | @@ -62,6 +62,7 @@ |
| 43 | }() |
| 44 | <-done |
| 45 | runtime.GC() |
| 46 | + runtime.GC() |
| 47 | select { |
| 48 | case <-ch: |
| 49 | case <-time.After(time.Second * 4): |