Re: [google 4_7] Fix bad merge into coverage_init (issue7322063)

2013-02-12 Thread Teresa Johnson
Ok, I will apply the same fix to google/main after appropriate testing. Teresa On Tue, Feb 12, 2013 at 1:54 PM, Xinliang David Li wrote: > ok. The same problem exists in google/main too. > > David > > On Tue, Feb 12, 2013 at 1:38 PM, Teresa Johnson wrote: >> This patch fixes a bad merge from go

Re: [google 4_7] Fix bad merge into coverage_init (issue7322063)

2013-02-12 Thread Xinliang David Li
ok. The same problem exists in google/main too. David On Tue, Feb 12, 2013 at 1:38 PM, Teresa Johnson wrote: > This patch fixes a bad merge from google/integration to google/4_7. > > Passes regression tests. Ok for google/4_7? > > Thanks, > Teresa > > 2013-02-12 Teresa Johnson > > * c

[google 4_7] Fix bad merge into coverage_init (issue7322063)

2013-02-12 Thread Teresa Johnson
This patch fixes a bad merge from google/integration to google/4_7. Passes regression tests. Ok for google/4_7? Thanks, Teresa 2013-02-12 Teresa Johnson * coverage.c (coverage_init): Move test coverage handling to the correct location within coverage_init (as in trunk)