123456789101112131415161718192021222324252627282930313233343536 |
- From 8a173f08d32960091d0ee9cab1b1e1e6df17c85a Mon Sep 17 00:00:00 2001
- From: Uri Simchoni <uri@samba.org>
- Date: Mon, 7 Oct 2019 00:37:41 +0300
- Subject: [PATCH] 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 <uri@samba.org>
- Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
- ---
- buildtools/wafsamba/samba_cross.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
- 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)
- --
- 2.20.1
|