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

[Michael Adam]

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
-------------- next part --------------
From d7375424fca06099e5782167d3a9012ed6f34a0e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 11 Jul 2016 11:08:22 +0200
Subject: [PATCH] autobuild: Don't compare socket wrapper so_path for xc check

This uses the build-directory which, hence is not the same.
Achieve this by adding the path itself and the whole
defines dictionary to the exclude list.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 script/compare_cc_results.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/compare_cc_results.py b/script/compare_cc_results.py
index b8ed399..43b46f8 100755
--- a/script/compare_cc_results.py
+++ b/script/compare_cc_results.py
@@ -8,7 +8,8 @@ import sys
 import difflib
 
 exceptions = ['BUILD_DIRECTORY', 'CROSS_COMPILE', 'CROSS_ANSWERS',
-              'CROSS_EXECUTE', 'SELFTEST_PREFIX']
+              'CROSS_EXECUTE', 'SELFTEST_PREFIX', 'LIBSOCKET_WRAPPER_SO_PATH',
+              'defines' ]
 
 base_lines = list()
 base_fname = ''
-- 
2.5.5

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160711/515fe9a0/signature.sig>