[Boost-commit] svn:boost r54758 - trunk/libs/serialization/util

Subject: [Boost-commit] svn:boost r54758 - trunk/libs/serialization/util
From: ramey_at_[hidden]
Date: 2009-07-07 00:09:14

Author: ramey
Date: 2009-07-07 00:09:13 EDT (Tue, 07 Jul 2009)
New Revision: 54758
URL: http://svn.boost.org/trac/boost/changeset/54758

Log:
Fixed misc bugs
void cast
added dll tests
simplified VC7IDE configurations and set up test for DLLS
Text files modified: 
   trunk/libs/serialization/util/test.jam |    31 ++++++++++++++++++-------------         
   1 files changed, 18 insertions(+), 13 deletions(-)

Modified: trunk/libs/serialization/util/test.jam
==============================================================================
--- trunk/libs/serialization/util/test.jam	(original)
+++ trunk/libs/serialization/util/test.jam	2009-07-07 00:09:13 EDT (Tue, 07 Jul 2009)
@@ -58,7 +58,7 @@
 }
 
 # each of the following tests is run with each type of archive
-rule run-invoke ( test-name : sources * : defns * )
+rule run-invoke ( test-name : sources * : requirements * )
 {
     local save-test = [ dependency-save-test $(test-name) ] ;
 
@@ -69,7 +69,7 @@
             $(sources)
             ../build//boost_serialization
         : # requirements
-            <define>$(defns)
+            $(requirements)
             <define>BOOST_LIB_DIAGNOSTIC=1
             <dependency>$(save-test)
     ] ;
@@ -77,7 +77,7 @@
 }
 
 # each of the following tests is run with each type of archive
-rule run-winvoke ( test-name : sources * : defns * )
+rule run-winvoke ( test-name : sources * : requirements * )
 {
     local save-test = [ dependency-save-test $(test-name) ] ;
 
@@ -89,7 +89,7 @@
             ../build//boost_serialization
             ../build//boost_wserialization
         : # requirements
-            <define>$(defns)
+            $(requirements)
             <define>BOOST_LIB_DIAGNOSTIC=1
             # both stlport and msvc6 define iswspace
             <toolset>msvc,<stdlib>stlport:<linkflags>"-force:multiple"
@@ -113,49 +113,54 @@
     return $(tests) ;
 }
 
-rule test-bsl-run ( test-name : sources * : requirements * )
+# for tests which are run just once rather than for every archive
+rule test-bsl-run ( test-name : sources * : libs * : requirements * )
 {
     local tests ;
     tests +=  [ 
         run-invoke $(test-name) 
         : # sources
-            $(test-name).cpp $(sources).cpp
+            $(test-name).cpp $(sources).cpp $(libs)
         :
             $(requirements)
     ] ;
     return $(tests) ;
 }
 
-rule test-bsl-run_archive ( test-name : archive-name : sources * ) {
+rule test-bsl-run_archive ( test-name : archive-name : sources * : libs * : requirements * ) {
     local tests ;
     switch $(archive-name) {
     case "*_warchive" :
         tests +=  [
             run-winvoke $(test-name)_$(archive-name)
             : 
-                $(sources).cpp
+                $(sources).cpp $(libs)
             :
-                BOOST_ARCHIVE_TEST=$(archive-name).hpp
+                <define>BOOST_ARCHIVE_TEST=$(archive-name).hpp
+                $(requirements)
         ] ;
     case "*" :
         tests +=  [
             run-invoke $(test-name)_$(archive-name)
             : 
-                $(sources).cpp
+                $(sources).cpp $(libs)
             : 
-                BOOST_ARCHIVE_TEST=$(archive-name).hpp
+                <define>BOOST_ARCHIVE_TEST=$(archive-name).hpp
+                $(requirements)
         ] ;
     }
     return $(tests) ;
 }
 
-rule test-bsl-run_files ( test-name : sources * ) {
+rule test-bsl-run_files ( test-name : sources * : libs * : requirements * ) {
     local tests ;
     for local defn in $(BOOST_ARCHIVE_LIST) {
         tests += [ 
             test-bsl-run_archive $(test-name) 
             : $(defn:LB) 
-            : $(test-name) $(sources)
+            : $(test-name) $(sources) 
+            : $(libs)
+            : $(requirements)
         ] ;
     }
     return $(tests) ;