Imported Upstream version 1.72.0

[platform/upstream/boost.git] / libs / serialization / test / Jamfile.v2

diff --git a/libs/serialization/test/Jamfile.v2 b/libs/serialization/test/Jamfile.v2
index 891fb29..cce1521 100644 (file)
--- a/libs/serialization/test/Jamfile.v2
+++ b/libs/serialization/test/Jamfile.v2
@@ -8,8 +8,7 @@
 
 project libs/serialization/test
     : id serialization_test
-    : requirements <source>/boost/filesystem
-    : requirements <source>/boost/system
+    : requirements <library>/boost/filesystem
     ;
 
 # import rules for testing conditional on config file variables
@@ -33,24 +32,25 @@ lib dll_a
     : 
         dll_a.cpp
         ../build//boost_serialization
-    : 
-        <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1 
+    :
+        <link>shared
     ;
+
 lib dll_polymorphic_base
     :
-        polymorphic_base.cpp 
+        dll_polymorphic_base.cpp 
         ../build//boost_serialization
-    : 
-        <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1 
+    :
+        <link>shared
     ;
 
 lib dll_polymorphic_derived2
     :
-        polymorphic_derived2.cpp
+        dll_polymorphic_derived2.cpp
         dll_polymorphic_base
         ../build//boost_serialization
-    : 
-        <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1 
+    :
+        <link>shared
     ;
 
 test-suite "serialization" :
@@ -117,12 +117,17 @@ test-suite "serialization" :
      [ test-bsl-run_files test_shared_ptr_multi_base ]
      [ test-bsl-run_files test_shared_ptr_132 : : : [ requires auto_ptr  ] ] # BOOST_NO_AUTO_PTR
 
-     [ test-bsl-run_polymorphic_files test_dll_exported : polymorphic_derived1 : dll_polymorphic_base dll_polymorphic_derived2 ]
-     [ test-bsl-run_polymorphic_files test_no_rtti : polymorphic_base polymorphic_derived1 polymorphic_derived2 ]
-     [ test-bsl-run_polymorphic_files test_exported : polymorphic_base polymorphic_derived1 polymorphic_derived2 ]
      [ test-bsl-run_polymorphic_files test_polymorphic : test_polymorphic_A A ]
      [ test-bsl-run_polymorphic_files test_polymorphic2 : test_polymorphic2imp ]
-     [ test-bsl-run_polymorphic_files test_polymorphic_helper ]
+     [ test-bsl-run_polymorphic_files test_p_helper ]
+
+     # this test should pass with both shared and static linking.  But B2 get's mixed up with static linking
+     # so we'll just run the shared version of the test, which is the one that we're most interested
+     # in anyway.
+     [ test-bsl-run_polymorphic_files test_dll_exported : polymorphic_derived1 :  dll_polymorphic_base dll_polymorphic_derived2  : <link>static:<build>no ]
+
+     [ test-bsl-run_polymorphic_files test_no_rtti : polymorphic_base polymorphic_derived1 polymorphic_derived2 ]
+     [ test-bsl-run_polymorphic_files test_exported : polymorphic_base polymorphic_derived1 polymorphic_derived2 ]
 
      # should compile
      [ compile test_strong_typedef.cpp ]
@@ -138,7 +143,7 @@ if ! $(BOOST_ARCHIVE_LIST) {
         # problems of linking incompatible versions of the runtime library.  So
         # we suppress tests of our dlls when using static libraries
 
-        [ test-bsl-run test_dll_simple   : : dll_a : ]
+        [ test-bsl-run test_dll_simple   : : dll_a :  <link>static:<build>no ]
         # [ test-bsl-run test_dll_plugin : : dll_derived2 : <link>static:<build>no <target-os>linux:<linkflags>-ldl ]
 
         [ test-bsl-run test_private_ctor ]