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

[Amitay Isaacs]

On Mon, Jul 11, 2016 at 12:26 PM, Amitay Isaacs <amitay at gmail.com> wrote:

>
> 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.
>
>
Autobuild failed for samba-xc task.

 configuration files ./bin/c4che/default.cache.py and ./bin-xe/c4che/
default.cache.py do not match

Tried to figure out if LIBSOCKET_WRAPPER_SO_PATH can be added to exceptions
in script/compare_cc_results.py, but the comparison code is too dumb to
correctly handle exceptions if they are in a dictionary.

What should be the correct LIBSOCKET_WRAPPER_SO_PATH when cross-compiling?

Here's the modified socket_wrapper patch that keeps the original behaviour
when cross-compiling.

Amitay.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patches
Type: application/octet-stream
Size: 2563 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160711/795b0171/patches.obj>