LGTM, thanks On Fri, Oct 24, 2014 at 11:01 AM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > > commit f44f444c94be6af68d2728ce75232526ad34aaaa > Merge: cf10188 abba7d4 > Author: Klaus Aehlig <[email protected]> > Date: Fri Oct 24 10:57:40 2014 +0200 > > Merge branch 'stable-2.11' into stable-2.12 > > * stable-2.11 > Force developer mode if haskell tests are enabled > Use the FD_DEFAULT constant > Run the EPO tests with watcher turned off > Add a 'with' context for running tests with paused watcher > > * stable-2.10 > Add a target to inspect make variables > Have fatal warnings on in developer mode > Add a flag --developer-mode > Fix check for sphinx-build from python2-sphinx > use the Python interpreter from env > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc Makefile.am > index 07839e5,15dc269..da61b5d > --- a/Makefile.am > +++ b/Makefile.am > @@@ -714,13 -643,12 +714,16 @@@ HFLAGS = > -fwarn-monomorphism-restriction \ > -fwarn-tabs \ > $(GHC_BYVERSION_FLAGS) > + if DEVELOPER_MODE > + HFLAGS += -Werror > + endif > > +HTEST_SUFFIX = hpc > +HPROF_SUFFIX = prof > + > if HPROFILE > -HFLAGS += -prof -auto-all > +HPROFFLAGS = -prof -fprof-auto-top -osuf $(HPROF_SUFFIX)_o \ > + -hisuf $(HPROF_SUFFIX)_hi -rtsopts > endif > if HCOVERAGE > HFLAGS += -fhpc > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores > -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
