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

[Amitay Isaacs]

On Mon, Jul 11, 2016 at 8:05 PM, Uri Simchoni <uri at samba.org> wrote:

> On 07/11/2016 12:59 PM, Michael Adam wrote:
> > On 2016-07-11 at 09:26 +0300, Uri Simchoni wrote:
> >> On 07/11/2016 07:18 AM, Amitay Isaacs wrote:
> >>> On Mon, Jul 11, 2016 at 12:26 PM, Amitay Isaacs <amitay at gmail.com>
> wrote:
> >>>>
> >>>> 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
> >
> > Oops... Apologies for only having tested what I thought were
> > the relevant autobuild targets... :-/
> >
> >>> 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.
> >>>
> >> I don't believe we have the infrastructure to run selftest of
> >> cross-built samba on a remote target from within waf, so the value of
> >> LIBSOCKET_WRAPPER_SO_PATH probably doesn't matter much.
> >
> > Agreed.
> >
> >> How about adding "defines" (the whole dictionary) to the exception list?
> >> The stuff that's in there is also listed as single items so I think we
> >> can safely omit it from the comparison.
> >
> > I think that is the right way to do it.
> > Like the attached patch? This would have
> > to be applied before the original 2 patches.
> >
> > Tested. Works.
> >
> > Cheers - Michael
> >
> RB+ me (also based on "Tested. Works." :) - I was about to say I'll only
> have time to test it later this day)
>
>
Pushing again with
  - Michael's patch for autobuild first (with Uri's RB),
  - my original patch to socket_wrapper, and
  - Michael's fix to use LIBSOCKET_WRAPPER_SO_PATH in ctdb/wscript

Amitay.