diff options
| author | Uri Simchoni <uri@samba.org> | 2019-10-07 00:37:41 +0300 |
|---|---|---|
| committer | Uri Simchoni <uri@samba.org> | 2019-10-20 12:06:30 +0000 |
| commit | fdfd69840902f4b13db2a204a0ca87a578b61b85 (patch) | |
| tree | 175119f347dea0e9d994e179613de0cd0daa0c54 /buildtools | |
| parent | 5a4ade953420a4122c80d291ac53310abd6a279c (diff) | |
| download | samba-fdfd69840902f4b13db2a204a0ca87a578b61b85.tar.gz | |
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>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_cross.py | 3 |
1 files changed, 2 insertions, 1 deletions
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) |