Skip to content

Commit

Permalink
Fix broken toolset.add-requirements.
Browse files Browse the repository at this point in the history
  • Loading branch information
swatanabe committed Mar 6, 2014
1 parent 7f8aac5 commit b869e58
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/build/toolset.jam
Expand Up @@ -559,7 +559,7 @@ rule add-requirements ( requirements * )
{
if ! $(.ignore-requirements)
{
requirements = [ property.translate-indirect $(specification) : [ CALLER_MODULE ] ] ;
requirements = [ property.translate-indirect $(requirements) : [ CALLER_MODULE ] ] ;
requirements = [ property.expand-subfeatures-in-conditions $(requirements) ] ;
requirements = [ property.make $(requirements) ] ;
.requirements = [ $(.requirements).add-raw $(requirements) ] ;
Expand Down
44 changes: 44 additions & 0 deletions test/toolset_requirements.py
@@ -0,0 +1,44 @@
#!/usr/bin/python

# Copyright 2014 Steven Watanabe
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)

# Test the handling of toolset.add-requirements

import BoostBuild

t = BoostBuild.Tester(pass_toolset=0, ignore_toolset_requirements=False)

t.write('jamroot.jam', '''
import toolset ;
import errors ;
rule test-rule ( properties * )
{
return <define>TEST_INDIRECT_CONDITIONAL ;
}
toolset.add-requirements
<define>TEST_MACRO
<conditional>@test-rule
<link>shared:<define>TEST_CONDITIONAL
;
rule check-requirements ( target : sources * : properties * )
{
local macros = TEST_MACRO TEST_CONDITIONAL TEST_INDIRECT_CONDITIONAL ;
for local m in $(macros)
{
if ! <define>$(m) in $(properties)
{
errors.error $(m) not defined ;
}
}
}
make test : : @check-requirements ;
''')

t.run_build_system()

t.cleanup()

0 comments on commit b869e58

Please sign in to comment.