← Back to team overview

dolfin team mailing list archive

Re: Merging into trunk

 

On Thu, Nov 17, 2011 at 01:28:03PM +0100, Anders Logg wrote:
> On Thu, Nov 17, 2011 at 12:24:50PM +0000, Garth N. Wells wrote:
> > On 17 November 2011 12:19, Anders Logg <logg@xxxxxxxxx> wrote:
> > > On Thu, Nov 17, 2011 at 12:12:58PM +0000, Garth N. Wells wrote:
> > >> On 17 November 2011 11:28, Anders Logg <logg@xxxxxxxxx> wrote:
> > >> > Do we have any policy on testing before merging into trunk?
> > >> >
> > >>
> > >> It's *much* easier if merges are frequent. Keeping numerous changes in
> > >> a personal branch and pushing later is making work for others to fix
> > >> the merge.
> > >
> > > Agree, but frequent merging requires frequent testing and testing
> > > takes a long time which means less frequent testing and thus less
> > > frequent merging... + I'm currently focusing only on 1.0.x.
> > >
> > >> > We currently don't have any buildbots for trunk (but plan to add in
> > >> > the near future).
> > >> >
> > >>
> > >> Just run 'make runtests'
> > >
> > > I can't afford it at the moment, or I'm overly pessimistic about the
> > > time it takes to run the test. How long does it take on your laptop?
> > >
> >
> > No very long. Also add -jxx to speed up the compilation.
>
> I'm testing now.
>
> > It's often a near certainty that particular changes will not break
> > anything. Running
> >
> >   make run_unittests
> >
> > will just run the unit tests, which is fast.
>
> What about
>
>   make run_quicktest

run_quicktest: 3m 15s
run_unittests: 3m 30s
runtests:      1h 15m

So one might as well run all the unit tests, but running all tests
looks too expensive (which is why we have the personal buildbots).

--
Anders


References