From: Uri Simchoni Date: Sun, 6 Oct 2019 21:37:41 +0000 (+0300) Subject: wafsamba: pass environment to cross-execute tests X-Git-Tag: talloc-2.3.1~285 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdfd69840902f4b13db2a204a0ca87a578b61b85;p=thirdparty%2Fsamba.git wafsamba: pass environment to cross-execute tests This can come in handy for cross-execute scripts in general, and is particularly required by the samba-xc test for cross-answers / cross-execute, because Samba sets LD_LIBRARY_PATH during rpath checks, and the test program needs that in order to successfully run. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13846 Signed-off-by: Uri Simchoni Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py index 6fca470f2b7..0868a855a0d 100644 --- a/buildtools/wafsamba/samba_cross.py +++ b/buildtools/wafsamba/samba_cross.py @@ -120,7 +120,8 @@ class cross_Popen(Utils.subprocess.Popen): if use_answers: p = real_Popen(newargs, stdout=Utils.subprocess.PIPE, - stderr=Utils.subprocess.PIPE) + stderr=Utils.subprocess.PIPE, + env=kw.get('env', {})) ce_out, ce_err = p.communicate() ans = (p.returncode, samba_utils.get_string(ce_out)) add_answer(ca_file, msg, ans)