[PATCH] fix ctdb autotest when recent socket-wrapper is installed in the system

Amitay Isaacs amitay at gmail.com
Mon Jul 11 02:26:37 UTC 2016


On Sun, Jul 10, 2016 at 7:47 AM, Michael Adam <obnox at samba.org> wrote:

> On 2016-07-08 at 23:42 +1000, Amitay Isaacs wrote:
> > Hi Michael,
> >
> > On Fri, Jul 8, 2016 at 9:53 PM, Michael Adam <obnox at samba.org> wrote:
> >
> > > Hi all,
> > >
> > > With current code, when a recent version of socket-wrapper is
> > > installed in the syste, ctdb autotest fails, because the
> > > ctdb/wscript has a hardcoded location to the socket-wrapper
> > > lib for preloading, irrespective of whether socket-wrapper is
> > > built or used from the system.
> > >
> > > Attached patch fixes this.  Please review!
> > >
> > >
> > How about constructing socket_wrapper library path relative to blddir
> > instead of srcdir?
> > That way we don't need any special case for ctdb build.
>
> Now that you said it... obviously good.
> The solution I had been looking for! :-)
>
> > I have added a socket_wrapper patch and modified your patch to remove
> > special case.
>
> This is good.  I tested it, too.
>
> Reviewed-by: me.
>
> Thanks - Michael
>

Pushed to autobuild.

Amitay.


More information about the samba-technical mailing list