diff --git a/src/build/property.jam b/src/build/property.jam index ca4fbc377..fafc3d50a 100644 --- a/src/build/property.jam +++ b/src/build/property.jam @@ -608,24 +608,24 @@ rule __test__ ( ) assert.true path-order $(test-space) on on ; assert.false path-order $(test-space) on on ; - assert.result-equal gcc off FOO + assert.result-set-equal gcc off FOO : refine gcc off : FOO : $(test-space) ; - assert.result-equal gcc on + assert.result-set-equal gcc on : refine gcc off : on : $(test-space) ; - assert.result-equal gcc off + assert.result-set-equal gcc off : refine gcc : off : $(test-space) ; - assert.result-equal gcc off off:FOO + assert.result-set-equal gcc off off:FOO : refine gcc : off off:FOO : $(test-space) ; - assert.result-equal gcc:foo gcc:bar + assert.result-set-equal gcc:foo gcc:bar : refine gcc:foo : gcc:bar : $(test-space) ; @@ -663,19 +663,19 @@ rule __test__ ( ) validate value : $(test-space) ; catch "value" is not a value of an implicit feature ; - assert.result-equal on + assert.result-set-equal on : remove free implicit : gcc foo on : $(test-space) ; - assert.result-equal a + assert.result-set-equal a : select include : a gcc ; - assert.result-equal a + assert.result-set-equal a : select include bar : a gcc ; - assert.result-equal a gcc + assert.result-set-equal a gcc : select include : a gcc ; - assert.result-equal kylix a + assert.result-set-equal kylix a : change gcc a : kylix ; pm = [ new property-map ] ; @@ -698,7 +698,7 @@ rule __test__ ( ) assert.result : split-conditional FOO=A::B ; # Test conditional feature. - assert.result-equal gcc,3.0 FOO + assert.result-set-equal gcc,3.0 FOO : split-conditional gcc,3.0:FOO ; feature.finish-test property-test-temp ; diff --git a/src/util/assert.jam b/src/util/assert.jam index 53658501a..de00478f2 100644 --- a/src/util/assert.jam +++ b/src/util/assert.jam @@ -165,7 +165,7 @@ rule result ( expected * : rule-name args * : * ) # to the result of calling RULE-NAME with the given arguments. Note that rules # called this way may accept at most 8 parameters. # -rule result-equal ( expected * : rule-name args * : * ) +rule result-set-equal ( expected * : rule-name args * : * ) { local result ; module [ CALLER_MODULE ]