Boost logo

Boost-Commit :

From: jurko.gospodnetic_at_[hidden]
Date: 2008-06-08 18:05:09


Author: jurko
Date: 2008-06-08 18:05:09 EDT (Sun, 08 Jun 2008)
New Revision: 46260
URL: http://svn.boost.org/trac/boost/changeset/46260

Log:
Renamed Boost Build's internal testing assert.result-equal rule to assert.result-set-equal to make it clear that results are compared as sets - ignoring duplicates and ordering.
Text files modified:
   trunk/tools/build/v2/build/property.jam | 22 +++++++++++-----------
   trunk/tools/build/v2/util/assert.jam | 2 +-
   2 files changed, 12 insertions(+), 12 deletions(-)

Modified: trunk/tools/build/v2/build/property.jam
==============================================================================
--- trunk/tools/build/v2/build/property.jam (original)
+++ trunk/tools/build/v2/build/property.jam 2008-06-08 18:05:09 EDT (Sun, 08 Jun 2008)
@@ -608,24 +608,24 @@
     assert.true path-order $(test-space) <optimization>on <rtti>on ;
     assert.false path-order $(test-space) <rtti>on <optimization>on ;
 
- assert.result-equal <toolset>gcc <rtti>off <define>FOO
+ assert.result-set-equal <toolset>gcc <rtti>off <define>FOO
         : refine <toolset>gcc <rtti>off
         : <define>FOO
         : $(test-space) ;
 
- assert.result-equal <toolset>gcc <optimization>on
+ assert.result-set-equal <toolset>gcc <optimization>on
         : refine <toolset>gcc <optimization>off
         : <optimization>on
         : $(test-space) ;
 
- assert.result-equal <toolset>gcc <rtti>off
+ assert.result-set-equal <toolset>gcc <rtti>off
         : refine <toolset>gcc : <rtti>off : $(test-space) ;
 
- assert.result-equal <toolset>gcc <rtti>off <rtti>off:<define>FOO
+ assert.result-set-equal <toolset>gcc <rtti>off <rtti>off:<define>FOO
         : refine <toolset>gcc : <rtti>off <rtti>off:<define>FOO
         : $(test-space) ;
 
- assert.result-equal <toolset>gcc:<define>foo <toolset>gcc:<define>bar
+ assert.result-set-equal <toolset>gcc:<define>foo <toolset>gcc:<define>bar
         : refine <toolset>gcc:<define>foo : <toolset>gcc:<define>bar
         : $(test-space) ;
 
@@ -663,19 +663,19 @@
         validate value : $(test-space) ;
     catch "value" is not a value of an implicit feature ;
 
- assert.result-equal <rtti>on
+ assert.result-set-equal <rtti>on
         : remove free implicit : <toolset>gcc <define>foo <rtti>on : $(test-space) ;
 
- assert.result-equal <include>a
+ assert.result-set-equal <include>a
         : select include : <include>a <toolset>gcc ;
 
- assert.result-equal <include>a
+ assert.result-set-equal <include>a
         : select include bar : <include>a <toolset>gcc ;
 
- assert.result-equal <include>a <toolset>gcc
+ assert.result-set-equal <include>a <toolset>gcc
         : select include <bar> <toolset> : <include>a <toolset>gcc ;
 
- assert.result-equal <toolset>kylix <include>a
+ assert.result-set-equal <toolset>kylix <include>a
         : change <toolset>gcc <include>a : <toolset> kylix ;
 
     pm = [ new property-map ] ;
@@ -698,7 +698,7 @@
     assert.result : split-conditional <define>FOO=A::B ;
 
     # Test conditional feature.
- assert.result-equal <toolset>gcc,<toolset-gcc:version>3.0 <define>FOO
+ assert.result-set-equal <toolset>gcc,<toolset-gcc:version>3.0 <define>FOO
         : split-conditional <toolset>gcc,<toolset-gcc:version>3.0:<define>FOO ;
 
     feature.finish-test property-test-temp ;

Modified: trunk/tools/build/v2/util/assert.jam
==============================================================================
--- trunk/tools/build/v2/util/assert.jam (original)
+++ trunk/tools/build/v2/util/assert.jam 2008-06-08 18:05:09 EDT (Sun, 08 Jun 2008)
@@ -165,7 +165,7 @@
 # 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 ]


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk