2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 13:22:11 +00:00

Merge from trunk

[SVN r34160]
This commit is contained in:
Vladimir Prus
2006-06-04 06:56:19 +00:00
parent c4e85886f1
commit b86e22f942

View File

@@ -527,6 +527,12 @@ generators.register-standard testing.expect-success
rule capture-output ( target : sources * : properties * )
{
# Setup up proper DLL search path.
# Here, $(sources[1]) is python module and $(sources[2]) is
# DLL. Only $(sources[1]) is passed to testing.capture-output,
# so RUN_PATH variable on $(sources[2]) is not consulted. Move it
# over explicitly.
RUN_PATH on $(sources[1]) = [ on $(sources[2]) return $(RUN_PATH) ] ;
PYTHONPATH = [ on $(sources[2]) return $(LOCATE) ] ;
testing.capture-output $(target) : $(sources[1]) : $(properties) ;
local c = [ common.prepend-path-variable-command PYTHONPATH : $(PYTHONPATH) ] ;