LGTM, thanks
On Mon, Sep 29, 2014 at 7:31 PM, 'Klaus Aehlig' via ganeti-devel <
ganeti-devel@googlegroups.com> wrote:
> To run the haskell tests, they need to be enabled.
>
> Signed-off-by: Klaus Aehlig <aeh...@google.com>
> ---
> .../files/srv/buildbot/masters/ganeti/master.cfg | 16
> ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git
> a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg
> b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg
> index 9ed66af..35fecae 100644
> --- a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg
> +++ b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg
> @@ -350,6 +350,7 @@ fdoclint = factory.BuildFactory(steps=[
> GenerateAutogen(),
> # Unknown options are ignored by configure
> GenerateConfigure("--enable-htools", "--enable-confd=haskell",
> + "--enable-haskell-tests",
> "--enable-manpages-in-doc",
> "--prefix=/usr",
> "--sysconfdir=/etc",
> @@ -501,14 +502,17 @@ def DownloadQaConfig(config_filename):
>
>
> def _QaBuild(ssh_service, checkout_mode, make_check):
> + configure_args =["--prefix=/usr", "--sysconfdir=/etc",
> + "--localstatedir=/var", "--with-lvm-stripecount=3",
> + "--enable-confd=haskell",
> + "--with-ssh-initscript=service %s" % ssh_service,
> + "--enable-symlinks")
> + if make_check:
> + configure_args.append("--enable-haskell-tests")
> steps = [
> GenerateCheckout(MASTER_BRANCH, mode=checkout_mode),
> GenerateAutogen(),
> - GenerateConfigure("--prefix=/usr", "--sysconfdir=/etc",
> - "--localstatedir=/var", "--with-lvm-stripecount=3",
> - "--enable-confd=haskell",
> - "--with-ssh-initscript=service %s" % ssh_service,
> - "--enable-symlinks"),
> + GenerateConfigure(**configure_args),
> ]
>
> if make_check:
> @@ -637,7 +641,7 @@ fdistcheck = factory.BuildFactory(steps=[
> GenerateResetPerms(True),
> GenerateCheckout(MASTER_BRANCH),
> GenerateAutogen(),
> - GenerateConfigure(),
> + GenerateConfigure("--enable-haskell-tests"),
> GenerateMakeLint(),
> GenerateMakeCheck(True),
> GenerateResetPerms(False),
> --
> 2.1.0.rc2.206.gedb03e5
>
>
--
Helga Velroyen | Software Engineer | hel...@google.com |
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
