Index: libs/assign/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/assign/test/Jamfile.v2,v
retrieving revision 1.3
diff -u -r1.3 Jamfile.v2
--- libs/assign/test/Jamfile.v2	16 Feb 2006 07:24:21 -0000	1.3
+++ libs/assign/test/Jamfile.v2	9 Nov 2006 20:27:10 -0000
@@ -11,7 +11,7 @@
 rule assign-test ( name )
 {
     return [
-        run $(name).cpp /boost/test//boost_unit_test_framework ]
+        run $(name).cpp /boost/test//boost_unit_test_framework/<link>static ]
         ;
 }
 
Index: libs/conversion/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/conversion/test/Jamfile.v2,v
retrieving revision 1.4
diff -u -r1.4 Jamfile.v2
--- libs/conversion/test/Jamfile.v2	28 Oct 2006 19:33:32 -0000	1.4
+++ libs/conversion/test/Jamfile.v2	9 Nov 2006 20:27:10 -0000
@@ -20,8 +20,8 @@
     [ compile-fail implicit_cast_fail.cpp ]
     [ run ../cast_test.cpp ]
     [ run ../numeric_cast_test.cpp ]    
-    [ run ../lexical_cast_test.cpp ../../test/build//boost_unit_test_framework ]
-    [ run lexical_cast_loopback_test.cpp ../../test/build//boost_unit_test_framework ]
+    [ run ../lexical_cast_test.cpp ../../test/build//boost_unit_test_framework/<link>static ]
+    [ run lexical_cast_loopback_test.cpp ../../test/build//boost_unit_test_framework/<link>static ]
   ;
 
       
Index: libs/format/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/format/test/Jamfile.v2,v
retrieving revision 1.1
diff -u -r1.1 Jamfile.v2
--- libs/format/test/Jamfile.v2	29 Sep 2003 16:04:28 -0000	1.1
+++ libs/format/test/Jamfile.v2	9 Nov 2006 20:27:11 -0000
@@ -7,37 +7,19 @@
 #  This software is provided "as is" without express or implied
 #  warranty, and with no claim as to its suitability for any purpose.
 
+project
+    : requirements 
+      <library>/boost/test//boost_test_exec_monitor/<link>static
+    ;
+
 import testing ;
 {
 
 test-suite "format"
-   :    [  run format_test1.cpp 
-                ../../../libs/test/build//boost_test_exec_monitor
-              : # args
-              : # input files
-#              : std::locale-support
-        ]
-
-        [ run format_test2.cpp 
-                ../../../libs/test/build//boost_test_exec_monitor
-              : # args
-              : # input files
-#              : std::locale-support
-        ]
-
-        [ run format_test3.cpp 
-                ../../../libs/test/build//boost_test_exec_monitor
-              : # args
-              : # input files
-#              : std::locale-support
-        ]
-
-        [ run format_test_wstring.cpp 
-                ../../../libs/test/build//boost_test_exec_monitor
-              : # args
-              : # input files
-#              : std::locale-support
-        ]
+   :    [ run format_test1.cpp ]
+        [ run format_test2.cpp ]
+        [ run format_test3.cpp ]
+        [ run format_test_wstring.cpp ]
   ;
 }
 
Index: libs/graph/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/graph/test/Jamfile.v2,v
retrieving revision 1.10
diff -u -r1.10 Jamfile.v2
--- libs/graph/test/Jamfile.v2	21 Sep 2006 17:02:14 -0000	1.10
+++ libs/graph/test/Jamfile.v2	9 Nov 2006 20:27:21 -0000
@@ -52,7 +52,7 @@
 
 
     [ run graphviz_test.cpp 
-            /boost/test//boost_test_exec_monitor 
+            /boost/test//boost_test_exec_monitor/<link>static 
             ../build//bgl-viz ]
 
     [ run gursoy_atun_layout_test.cpp ]
Index: libs/io/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/io/test/Jamfile.v2,v
retrieving revision 1.1
diff -u -r1.1 Jamfile.v2
--- libs/io/test/Jamfile.v2	11 Jun 2004 12:03:36 -0000	1.1
+++ libs/io/test/Jamfile.v2	9 Nov 2006 20:27:21 -0000
@@ -9,14 +9,14 @@
 
 test-suite "io"
    :    [  run ios_state_unit_test.cpp 
-                ../../../libs/test/build//boost_unit_test_framework
+                ../../../libs/test/build//boost_unit_test_framework/<link>static
               : # args
               : # input files
               # : std::locale-support
         ]
 
         [ run ios_state_test.cpp 
-                ../../../libs/test/build//boost_test_exec_monitor
+                ../../../libs/test/build//boost_test_exec_monitor/<link>static
               : # args
               : # input files
               # : std::locale-support
Index: libs/iostreams/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/iostreams/test/Jamfile.v2,v
retrieving revision 1.13
diff -u -r1.13 Jamfile.v2
--- libs/iostreams/test/Jamfile.v2	17 Oct 2006 12:52:11 -0000	1.13
+++ libs/iostreams/test/Jamfile.v2	9 Nov 2006 20:27:21 -0000
@@ -17,7 +17,7 @@
     return [
             run
                 $(sources)
-                /boost/test//boost_unit_test_framework
+                /boost/test//boost_unit_test_framework/<link>static
             : # command
             : # input files
             : # build requirements
Index: libs/math/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/math/test/Jamfile.v2,v
retrieving revision 1.4
diff -u -r1.4 Jamfile.v2
--- libs/math/test/Jamfile.v2	3 Nov 2006 03:08:27 -0000	1.4
+++ libs/math/test/Jamfile.v2	9 Nov 2006 20:27:21 -0000
@@ -7,21 +7,21 @@
 import testing ;
 
 run ../test/common_factor_test.cpp
-    ../../test/build//boost_unit_test_framework ;
+    ../../test/build//boost_unit_test_framework/<link>static ;
 
 run ../octonion/octonion_test.cpp
-    ../../test/build//boost_unit_test_framework ;
+    ../../test/build//boost_unit_test_framework/<link>static ;
 
 run ../quaternion/quaternion_test.cpp
-    ../../test/build//boost_unit_test_framework ;
+    ../../test/build//boost_unit_test_framework/<link>static ;
 
 run ../special_functions/special_functions_test.cpp
-    ../../test/build//boost_unit_test_framework ;
+    ../../test/build//boost_unit_test_framework/<link>static ;
 
 run ../quaternion/quaternion_mult_incl_test.cpp 
     ../quaternion/quaternion_mi1.cpp
     ../quaternion/quaternion_mi2.cpp
-    ../../test/build//boost_unit_test_framework ;
+    ../../test/build//boost_unit_test_framework/<link>static ;
 
 run complex_test.cpp ;
 run hypot_test.cpp ;
Index: libs/numeric/interval/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/numeric/interval/test/Jamfile.v2,v
retrieving revision 1.6
diff -u -r1.6 Jamfile.v2
--- libs/numeric/interval/test/Jamfile.v2	10 Mar 2006 12:51:35 -0000	1.6
+++ libs/numeric/interval/test/Jamfile.v2	9 Nov 2006 20:27:21 -0000
@@ -32,18 +32,18 @@
     [ run libs/numeric/interval/test/pow.cpp      ]
 
     [ run libs/numeric/interval/test/cmp.cpp
-        ../../../test/build//boost_test_exec_monitor ]
+        ../../../test/build//boost_test_exec_monitor/<link>static ]
     [ run libs/numeric/interval/test/cmp_exn.cpp
-        ../../../test/build//boost_test_exec_monitor ]
+        ../../../test/build//boost_test_exec_monitor/<link>static ]
     [ run libs/numeric/interval/test/cmp_exp.cpp
-        ../../../test/build//boost_test_exec_monitor ]
+        ../../../test/build//boost_test_exec_monitor/<link>static ]
     [ run libs/numeric/interval/test/cmp_lex.cpp
-        ../../../test/build//boost_test_exec_monitor ]
+        ../../../test/build//boost_test_exec_monitor/<link>static ]
     [ run libs/numeric/interval/test/cmp_set.cpp
-        ../../../test/build//boost_test_exec_monitor ]
+        ../../../test/build//boost_test_exec_monitor/<link>static ]
     [ run libs/numeric/interval/test/cmp_tribool.cpp
-        ../../../test/build//boost_test_exec_monitor ]
+        ../../../test/build//boost_test_exec_monitor/<link>static ]
     [ run libs/numeric/interval/test/test_float.cpp
-        ../../../test/build//boost_test_exec_monitor ]
+        ../../../test/build//boost_test_exec_monitor/<link>static ]
   ;
 }
Index: libs/program_options/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/program_options/test/Jamfile.v2,v
retrieving revision 1.6
diff -u -r1.6 Jamfile.v2
--- libs/program_options/test/Jamfile.v2	13 Feb 2006 09:04:49 -0000	1.6
+++ libs/program_options/test/Jamfile.v2	9 Nov 2006 20:27:29 -0000
@@ -2,7 +2,7 @@
 project
     : requirements 
     <library>../build//boost_program_options
-    <library>/boost/test//boost_test_exec_monitor
+    <library>/boost/test//boost_test_exec_monitor/<link>static
     <link>static
     
 #    <define>_GLIBCXX_CONCEPT_CHECKS
Index: libs/program_options/test/test_convert.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/program_options/test/test_convert.cpp,v
retrieving revision 1.2
diff -u -r1.2 test_convert.cpp
--- libs/program_options/test/test_convert.cpp	28 Feb 2006 22:56:33 -0000	1.2
+++ libs/program_options/test/test_convert.cpp	9 Nov 2006 20:27:29 -0000
@@ -3,6 +3,7 @@
 // (See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <cassert>
 #include <string>
 #include <fstream>
 #include <sstream>
@@ -14,6 +15,8 @@
 #include <boost/program_options/detail/convert.hpp>
 #include <boost/program_options/detail/utf8_codecvt_facet.hpp>
 
+#include <boost/test/test_tools.hpp>
+
 using namespace std;
 
 string file_content(const string& filename)
@@ -74,7 +77,7 @@
 void test_convert(const std::string& input, 
                   const std::string& expected_output)
 {
-    boost::program_options::detail::utf8_codecvt_facet<wchar_t, char> facet;
+    boost::program_options::detail::utf8_codecvt_facet facet;
     
     std::wstring output;
     { 
Index: libs/ptr_container/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/ptr_container/test/Jamfile.v2,v
retrieving revision 1.8
diff -u -r1.8 Jamfile.v2
--- libs/ptr_container/test/Jamfile.v2	6 Mar 2006 08:55:20 -0000	1.8
+++ libs/ptr_container/test/Jamfile.v2	9 Nov 2006 20:27:29 -0000
@@ -2,7 +2,7 @@
 rule sc-test ( name : extra-sources * )
 {
     return [ 
-      run $(name).cpp /boost/test//boost_unit_test_framework $(extra-sources) ]
+      run $(name).cpp /boost/test//boost_unit_test_framework/<link>static $(extra-sources) ]
     ;
 }
 
Index: libs/range/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/range/test/Jamfile.v2,v
retrieving revision 1.2
diff -u -r1.2 Jamfile.v2
--- libs/range/test/Jamfile.v2	7 Feb 2006 11:55:46 -0000	1.2
+++ libs/range/test/Jamfile.v2	9 Nov 2006 20:27:29 -0000
@@ -11,7 +11,7 @@
 rule range-test ( name : includes * )
 {
     return [
-        run $(name).cpp /boost/test//boost_unit_test_framework
+        run $(name).cpp /boost/test//boost_unit_test_framework/<link>static
         : 
         : 
         : $(includes)
Index: libs/serialization/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/serialization/test/Jamfile.v2,v
retrieving revision 1.5
diff -u -r1.5 Jamfile.v2
--- libs/serialization/test/Jamfile.v2	22 Jun 2006 07:21:22 -0000	1.5
+++ libs/serialization/test/Jamfile.v2	9 Nov 2006 20:27:29 -0000
@@ -26,7 +26,7 @@
 rule run-template ( test-name : sources * : requirements * ) {
     return [
         run
-            ../../test/build//boost_test_exec_monitor
+            ../../test/build//boost_test_exec_monitor/<link>static
             $(sources)
         : # command
         : # input files
Index: libs/statechart/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/statechart/test/Jamfile.v2,v
retrieving revision 1.7
diff -u -r1.7 Jamfile.v2
--- libs/statechart/test/Jamfile.v2	16 Jul 2006 10:24:33 -0000	1.7
+++ libs/statechart/test/Jamfile.v2	9 Nov 2006 20:27:42 -0000
@@ -6,7 +6,7 @@
 
 project libs/statechart/test ;
 
-local test_monitor = ../../../libs/test/build//boost_test_exec_monitor ;
+local test_monitor = ../../../libs/test/build//boost_test_exec_monitor/<link>static ;
 # Some platforms have either problems with the automatic detection of the
 # threading mode (e.g. vc-7_1 & gcc >= 3.4.0) or don't support single-
 # threaded mode (e.g. vc-8_0). We therefore manually turn MT off here
Index: libs/test/build/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/test/build/Jamfile.v2,v
retrieving revision 1.11
diff -u -r1.11 Jamfile.v2
--- libs/test/build/Jamfile.v2	17 Apr 2006 09:39:56 -0000	1.11
+++ libs/test/build/Jamfile.v2	9 Nov 2006 20:27:42 -0000
@@ -7,9 +7,20 @@
 project boost/test 
     : source-location ../src
     : requirements <define>BOOST_TEST_NO_AUTO_LINK=1
-                   <os>NT:<link>static
+
+        <link>shared:<define>BOOST_TEST_DYN_LINK=1
+        # Disable Warning about boost::noncopyable not being exported
+        <link>shared,<toolset>msvc:<cxxflags>-wd4275
+
                    <toolset>msvc:<asynch-exceptions>on
                    <toolset>borland:<cxxflags>-w-8080
+    : usage-requirements
+        <define>BOOST_TEST_NO_AUTO_LINK=1
+
+        <link>shared:<define>BOOST_TEST_DYN_LINK=1
+
+        # Disable Warning about boost::noncopyable not being exported
+        <link>shared,<toolset>msvc:<cxxflags>-wd4275
     ;
 
 PRG_EXEC_MON_SOURCES =
@@ -66,4 +77,4 @@
 
 alias minimal : : : :
                    <toolset>msvc:<asynch-exceptions>on
-       ;
\ No newline at end of file
+       ;
Index: libs/test/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/test/test/Jamfile.v2,v
retrieving revision 1.9
diff -u -r1.9 Jamfile.v2
--- libs/test/test/Jamfile.v2	19 Mar 2006 11:49:03 -0000	1.9
+++ libs/test/test/Jamfile.v2	9 Nov 2006 20:27:42 -0000
@@ -22,15 +22,15 @@
 
 test-suite "basics_test"
         :
-          [ test-btl-lib run : class_properties_test    : boost_unit_test_framework ]
-          [ test-btl-lib run : basic_cstring_test    : boost_unit_test_framework ]
+          [ test-btl-lib run : class_properties_test    : boost_unit_test_framework/<link>static ]
+          [ test-btl-lib run : basic_cstring_test    : boost_unit_test_framework/<link>static ]
         ;
 
 test-suite "prg_exec_monitor_test"
         : [ test-btl-lib run-fail : prg_exec_fail1 : boost_prg_exec_monitor ]
-          [ test-btl-lib run-fail : prg_exec_fail2 : boost_prg_exec_monitor ]
-          [ test-btl-lib run-fail : prg_exec_fail3 : boost_prg_exec_monitor ]
-          [ test-btl-lib run-fail : prg_exec_fail4 : boost_prg_exec_monitor ]
+          [ test-btl-lib run-fail : prg_exec_fail2 : boost_prg_exec_monitor/<link>static ]
+          [ test-btl-lib run-fail : prg_exec_fail3 : boost_prg_exec_monitor/<link>static ]
+          [ test-btl-lib run-fail : prg_exec_fail4 : boost_prg_exec_monitor/<link>static ]
         ;
 
 test-suite "unit_test_framework_test"
@@ -48,10 +48,10 @@
           [ test-btl-lib run : test_fp_comparisons      : boost_unit_test_framework ]
           [ test-btl-lib run : test_tools_test          : boost_unit_test_framework : test_files/test_tools_test.pattern ]
           [ test-btl-lib run : test_case_template_test  : boost_unit_test_framework ]
-          [ test-btl-lib run : custom_exception_test    : boost_unit_test_framework ]
+          [ test-btl-lib run : custom_exception_test    : boost_unit_test_framework/<link>static ]
           [ test-btl-lib run : fixed_mapping_test       : boost_unit_test_framework ]
           [ test-btl-lib run : ifstream_line_iterator_test : boost_unit_test_framework : test_files/ifstream_line_iterator.tst1 test_files/ifstream_line_iterator.tst2 ]
-          [ test-btl-lib run : algorithms_test : boost_unit_test_framework ]
+          [ test-btl-lib run : algorithms_test : boost_unit_test_framework/<link>static ]
           [ test-btl-lib run : token_iterator_test : boost_unit_test_framework ]
           [ test-btl-lib run : boost_check_equal_str    : boost_unit_test_framework ]
             ;
Index: libs/thread/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/thread/test/Jamfile.v2,v
retrieving revision 1.5
diff -u -r1.5 Jamfile.v2
--- libs/thread/test/Jamfile.v2	14 Sep 2006 23:02:27 -0000	1.5
+++ libs/thread/test/Jamfile.v2	9 Nov 2006 20:27:42 -0000
@@ -18,7 +18,7 @@
 import testing ;
 
 project
-    : requirements <library>../../test/build//boost_unit_test_framework
+    : requirements <library>/boost/test//boost_unit_test_framework/<link>static
                    <threading>multi
     ;
     
Index: libs/utility/test/Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/utility/test/Jamfile.v2,v
retrieving revision 1.14
diff -u -r1.14 Jamfile.v2
--- libs/utility/test/Jamfile.v2	16 Mar 2005 22:02:22 -0000	1.14
+++ libs/utility/test/Jamfile.v2	9 Nov 2006 20:27:42 -0000
@@ -18,15 +18,15 @@
         [ run ../binary_search_test.cpp ]
         [ run ../call_traits_test.cpp : -u ]
         [ compile-fail ../checked_delete_test.cpp ]
-        [ run ../compressed_pair_test.cpp ../../test/build//boost_test_exec_monitor : -u ]
+        [ run ../compressed_pair_test.cpp ../../test/build//boost_test_exec_monitor/<link>static : -u ]
         [ run ../current_function_test.cpp : : : <test-info>always_show_run_output ]
-        [ run ../iterators_test.cpp ../../test/build//boost_test_exec_monitor ]
-        [ run next_prior_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ run ../iterators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
+        [ run next_prior_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
         [ compile-fail ../noncopyable_test.cpp ]
         [ run ../numeric_traits_test.cpp ]
-        [ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ run ../operators_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
         [ compile ../ref_ct_test.cpp  ]
-        [ run ../ref_test.cpp ../../test/build//boost_test_exec_monitor ]
+        [ run ../ref_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
         [ compile result_of_test.cpp ]
         [ run ../shared_iterator_test.cpp ]
         [ run ../value_init_test.cpp ]