$include_dir="/home/hyper-archives/boost-commit/include"; include("$include_dir/msg-header.inc") ?>
Subject: [Boost-commit] svn:boost r82782 - in trunk/libs/math: minimax test test/test_rational_instances tools
From: gennadiy.rozental_at_[hidden]
Date: 2013-02-08 00:10:16
Author: rogeeff
Date: 2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
New Revision: 82782
URL: http://svn.boost.org/trac/boost/changeset/82782
Log:
Eliminated test_exec_monitor
Text files modified: 
   trunk/libs/math/minimax/main.cpp                               |     5                                         
   trunk/libs/math/test/Jamfile.v2                                |   616 +++++++++++++++++++-------------------  
   trunk/libs/math/test/acosh_test.hpp                            |     2                                         
   trunk/libs/math/test/asinh_test.hpp                            |     2                                         
   trunk/libs/math/test/atanh_test.hpp                            |     2                                         
   trunk/libs/math/test/complex_test.cpp                          |     7                                         
   trunk/libs/math/test/hypot_test.cpp                            |     6                                         
   trunk/libs/math/test/log1p_expm1_test.cpp                      |     6                                         
   trunk/libs/math/test/pch.hpp                                   |     2                                         
   trunk/libs/math/test/pch_light.hpp                             |     2                                         
   trunk/libs/math/test/pow_test.cpp                              |     7                                         
   trunk/libs/math/test/powm1_sqrtp1m1_test.cpp                   |     6                                         
   trunk/libs/math/test/sinc_test.hpp                             |     2                                         
   trunk/libs/math/test/sinhc_test.hpp                            |     2                                         
   trunk/libs/math/test/test_airy.cpp                             |     6                                         
   trunk/libs/math/test/test_bernoulli.cpp                        |     8                                         
   trunk/libs/math/test/test_bessel_airy_zeros.cpp                |    15                                         
   trunk/libs/math/test/test_bessel_i.cpp                         |     3                                         
   trunk/libs/math/test/test_bessel_i.hpp                         |     3                                         
   trunk/libs/math/test/test_bessel_j.cpp                         |     3                                         
   trunk/libs/math/test/test_bessel_j.hpp                         |     3                                         
   trunk/libs/math/test/test_bessel_k.cpp                         |     3                                         
   trunk/libs/math/test/test_bessel_k.hpp                         |     3                                         
   trunk/libs/math/test/test_bessel_y.cpp                         |     3                                         
   trunk/libs/math/test/test_bessel_y.hpp                         |     3                                         
   trunk/libs/math/test/test_beta.cpp                             |     3                                         
   trunk/libs/math/test/test_beta.hpp                             |     3                                         
   trunk/libs/math/test/test_beta_dist.cpp                        |     8                                         
   trunk/libs/math/test/test_binomial.cpp                         |     8                                         
   trunk/libs/math/test/test_binomial_coeff.cpp                   |     3                                         
   trunk/libs/math/test/test_binomial_coeff.hpp                   |     3                                         
   trunk/libs/math/test/test_carlson.cpp                          |     4                                         
   trunk/libs/math/test/test_carlson.hpp                          |     3                                         
   trunk/libs/math/test/test_cauchy.cpp                           |     8                                         
   trunk/libs/math/test/test_cbrt.cpp                             |     3                                         
   trunk/libs/math/test/test_cbrt.hpp                             |     3                                         
   trunk/libs/math/test/test_chi_squared.cpp                      |     8                                         
   trunk/libs/math/test/test_classify.cpp                         |     6                                         
   trunk/libs/math/test/test_constants.cpp                        |     8                                         
   trunk/libs/math/test/test_digamma.cpp                          |     3                                         
   trunk/libs/math/test/test_digamma.hpp                          |     3                                         
   trunk/libs/math/test/test_dist_overloads.cpp                   |     8                                         
   trunk/libs/math/test/test_ellint_1.cpp                         |     3                                         
   trunk/libs/math/test/test_ellint_1.hpp                         |     3                                         
   trunk/libs/math/test/test_ellint_2.cpp                         |     3                                         
   trunk/libs/math/test/test_ellint_2.hpp                         |     3                                         
   trunk/libs/math/test/test_ellint_3.cpp                         |     3                                         
   trunk/libs/math/test/test_ellint_3.hpp                         |     3                                         
   trunk/libs/math/test/test_erf.cpp                              |     3                                         
   trunk/libs/math/test/test_erf.hpp                              |     3                                         
   trunk/libs/math/test/test_error_handling.cpp                   |     8                                         
   trunk/libs/math/test/test_expint.cpp                           |     3                                         
   trunk/libs/math/test/test_expint.hpp                           |     3                                         
   trunk/libs/math/test/test_exponential_dist.cpp                 |     8                                         
   trunk/libs/math/test/test_extreme_value.cpp                    |     9                                         
   trunk/libs/math/test/test_factorials.cpp                       |     7                                         
   trunk/libs/math/test/test_find_location.cpp                    |     9                                         
   trunk/libs/math/test/test_find_scale.cpp                       |     9                                         
   trunk/libs/math/test/test_fisher_f.cpp                         |     9                                         
   trunk/libs/math/test/test_gamma.cpp                            |     4                                         
   trunk/libs/math/test/test_gamma.hpp                            |     3                                         
   trunk/libs/math/test/test_gamma_dist.cpp                       |     9                                         
   trunk/libs/math/test/test_geometric.cpp                        |     9                                         
   trunk/libs/math/test/test_hankel.cpp                           |     7                                         
   trunk/libs/math/test/test_hermite.cpp                          |     4                                         
   trunk/libs/math/test/test_hermite.hpp                          |     3                                         
   trunk/libs/math/test/test_hypergeometric_dist.cpp              |     9                                         
   trunk/libs/math/test/test_ibeta.cpp                            |     4                                         
   trunk/libs/math/test/test_ibeta.hpp                            |     3                                         
   trunk/libs/math/test/test_ibeta_inv.cpp                        |     4                                         
   trunk/libs/math/test/test_ibeta_inv.hpp                        |     3                                         
   trunk/libs/math/test/test_ibeta_inv_ab.cpp                     |     4                                         
   trunk/libs/math/test/test_ibeta_inv_ab.hpp                     |     3                                         
   trunk/libs/math/test/test_igamma.cpp                           |     4                                         
   trunk/libs/math/test/test_igamma.hpp                           |     3                                         
   trunk/libs/math/test/test_igamma_inv.cpp                       |     4                                         
   trunk/libs/math/test/test_igamma_inv.hpp                       |     3                                         
   trunk/libs/math/test/test_igamma_inva.cpp                      |     4                                         
   trunk/libs/math/test/test_igamma_inva.hpp                      |     3                                         
   trunk/libs/math/test/test_inv_hyp.cpp                          |     7                                         
   trunk/libs/math/test/test_inverse_chi_squared.cpp              |     9                                         
   trunk/libs/math/test/test_inverse_chi_squared_distribution.cpp |     9                                         
   trunk/libs/math/test/test_inverse_gamma_distribution.cpp       |     9                                         
   trunk/libs/math/test/test_inverse_gaussian.cpp                 |     9                                         
   trunk/libs/math/test/test_jacobi.cpp                           |     4                                         
   trunk/libs/math/test/test_jacobi.hpp                           |     3                                         
   trunk/libs/math/test/test_laguerre.cpp                         |     4                                         
   trunk/libs/math/test/test_laguerre.hpp                         |     3                                         
   trunk/libs/math/test/test_legendre.cpp                         |     4                                         
   trunk/libs/math/test/test_legendre.hpp                         |     3                                         
   trunk/libs/math/test/test_logistic_dist.cpp                    |     9                                         
   trunk/libs/math/test/test_lognormal.cpp                        |     9                                         
   trunk/libs/math/test/test_long_double_support.cpp              |     9                                         
   trunk/libs/math/test/test_minima.cpp                           |     7                                         
   trunk/libs/math/test/test_nc_beta.cpp                          |     9                                         
   trunk/libs/math/test/test_nc_chi_squared.cpp                   |     9                                         
   trunk/libs/math/test/test_nc_f.cpp                             |     9                                         
   trunk/libs/math/test/test_nc_t.cpp                             |     9                                         
   trunk/libs/math/test/test_negative_binomial.cpp                |     9                                         
   trunk/libs/math/test/test_next.cpp                             |     7                                         
   trunk/libs/math/test/test_normal.cpp                           |     9                                         
   trunk/libs/math/test/test_owens_t.cpp                          |     9                                         
   trunk/libs/math/test/test_pareto.cpp                           |     9                                         
   trunk/libs/math/test/test_poisson.cpp                          |     9                                         
   trunk/libs/math/test/test_policy.cpp                           |     9                                         
   trunk/libs/math/test/test_policy_2.cpp                         |    10                                         
   trunk/libs/math/test/test_policy_3.cpp                         |     9                                         
   trunk/libs/math/test/test_policy_4.cpp                         |    10                                         
   trunk/libs/math/test/test_policy_5.cpp                         |     9                                         
   trunk/libs/math/test/test_policy_6.cpp                         |    10                                         
   trunk/libs/math/test/test_policy_7.cpp                         |     9                                         
   trunk/libs/math/test/test_policy_8.cpp                         |    10                                         
   trunk/libs/math/test/test_policy_sf.cpp                        |     7                                         
   trunk/libs/math/test/test_rational_instances/test_rational.hpp |     2                                         
   trunk/libs/math/test/test_rationals.cpp                        |     7                                         
   trunk/libs/math/test/test_rayleigh.cpp                         |     9                                         
   trunk/libs/math/test/test_real_concept.cpp                     |     9                                         
   trunk/libs/math/test/test_remez.cpp                            |     7                                         
   trunk/libs/math/test/test_roots.cpp                            |     7                                         
   trunk/libs/math/test/test_round.cpp                            |     7                                         
   trunk/libs/math/test/test_sign.cpp                             |    11                                         
   trunk/libs/math/test/test_skew_normal.cpp                      |     9                                         
   trunk/libs/math/test/test_spherical_harmonic.cpp               |     7                                         
   trunk/libs/math/test/test_students_t.cpp                       |     9                                         
   trunk/libs/math/test/test_tgamma_ratio.cpp                     |     4                                         
   trunk/libs/math/test/test_tgamma_ratio.hpp                     |     3                                         
   trunk/libs/math/test/test_toms748_solve.cpp                    |     7                                         
   trunk/libs/math/test/test_tr1.cpp                              |     7                                         
   trunk/libs/math/test/test_triangular.cpp                       |     9                                         
   trunk/libs/math/test/test_uniform.cpp                          |     9                                         
   trunk/libs/math/test/test_weibull.cpp                          |     9                                         
   trunk/libs/math/test/test_zeta.cpp                             |     4                                         
   trunk/libs/math/test/test_zeta.hpp                             |     3                                         
   trunk/libs/math/tools/carlson_ellint_data.cpp                  |     4                                         
   trunk/libs/math/tools/digamma_data.cpp                         |     4                                         
   trunk/libs/math/tools/ellint_e_data.cpp                        |     4                                         
   trunk/libs/math/tools/ellint_f_data.cpp                        |     4                                         
   trunk/libs/math/tools/ellint_k_data.cpp                        |     4                                         
   trunk/libs/math/tools/ellint_pi2_data.cpp                      |     4                                         
   trunk/libs/math/tools/ellint_pi3_data.cpp                      |     4                                         
   trunk/libs/math/tools/erf_data.cpp                             |     4                                         
   trunk/libs/math/tools/gamma_P_inva_data.cpp                    |     4                                         
   trunk/libs/math/tools/hermite_data.cpp                         |     4                                         
   trunk/libs/math/tools/hypergeometric_dist_data.cpp             |     4                                         
   trunk/libs/math/tools/ibeta_data.cpp                           |     4                                         
   trunk/libs/math/tools/ibeta_inv_data.cpp                       |     4                                         
   trunk/libs/math/tools/ibeta_invab_data.cpp                     |     4                                         
   trunk/libs/math/tools/igamma_data.cpp                          |     4                                         
   trunk/libs/math/tools/inv_hyp_data.cpp                         |     4                                         
   trunk/libs/math/tools/laguerre_data.cpp                        |     4                                         
   trunk/libs/math/tools/lanczos_generator.cpp                    |     4                                         
   trunk/libs/math/tools/legendre_data.cpp                        |     4                                         
   trunk/libs/math/tools/spherical_harmonic_data.cpp              |     4                                         
   trunk/libs/math/tools/tgamma_ratio_data.cpp                    |     4                                         
   trunk/libs/math/tools/zeta_data.cpp                            |     4                                         
   155 files changed, 766 insertions(+), 714 deletions(-)
Modified: trunk/libs/math/minimax/main.cpp
==============================================================================
--- trunk/libs/math/minimax/main.cpp	(original)
+++ trunk/libs/math/minimax/main.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <iomanip>
 #include <string>
-#include <boost/test/included/test_exec_monitor.hpp> // for test_main
+#include <boost/test/included/unit_test.hpp> // for test_main
 
 extern boost::math::ntl::RR f(const boost::math::ntl::RR& x, int variant);
 extern void show_extra(
@@ -497,7 +497,7 @@
    }
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    std::string line;
    real_parser<long double/*boost::math::ntl::RR*/ > const rr_p;
@@ -604,5 +604,4 @@
          std::cout << std::endl;
      }
    }
-   return 0;
 }
Modified: trunk/libs/math/test/Jamfile.v2
==============================================================================
--- trunk/libs/math/test/Jamfile.v2	(original)
+++ trunk/libs/math/test/Jamfile.v2	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -66,551 +66,551 @@
 
 explicit ntl ;
 
-cpp-pch pch : pch.hpp : <use>../../test/build//boost_test_exec_monitor ;
-cpp-pch pch_light : pch_light.hpp : <use>../../test/build//boost_test_exec_monitor ;
+cpp-pch pch : pch.hpp : <use>../../test/build//boost_unit_test_framework ;
+cpp-pch pch_light : pch_light.hpp : <use>../../test/build//boost_unit_test_framework ;
 
 #lib test_instances : float_test_instances.cpp double_test_instances.cpp ldouble_test_instances.cpp real_concept_test_instances.cpp pch 
 #                   : <link>static ;
 
-run hypot_test.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run pow_test.cpp ../../test/build//boost_test_exec_monitor ;
-run log1p_expm1_test.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run powm1_sqrtp1m1_test.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run hypot_test.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run pow_test.cpp ../../test/build//boost_unit_test_framework ;
+run log1p_expm1_test.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run powm1_sqrtp1m1_test.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
 run special_functions_test.cpp ../../test/build//boost_unit_test_framework ;
-run test_airy.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_bernoulli.cpp ../../test/build//boost_test_exec_monitor ;
-run test_constants.cpp ../../test/build//boost_test_exec_monitor ;
+run test_airy.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_bernoulli.cpp ../../test/build//boost_unit_test_framework ;
+run test_constants.cpp ../../test/build//boost_unit_test_framework ;
 run test_print_info_on_type.cpp ;
 run test_constant_generate.cpp ntl  : : : [ check-target-builds ../config//has_ntl_rr : : <build>no ] : test_constant_generate_ntl ;
-run test_bessel_j.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_bessel_y.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_bessel_i.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_bessel_k.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_beta.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_beta_dist.cpp ../../test/build//boost_test_exec_monitor ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_bessel_j.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_bessel_y.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_bessel_i.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_bessel_k.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_beta.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_beta_dist.cpp ../../test/build//boost_unit_test_framework ;
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_binomial_float ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_binomial_double ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_binomial_long_double ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_ROUNDING=0
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_ROUNDING=0
+          <toolset>intel:<pch>off
         : test_binomial_real_concept0 ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_ROUNDING=1
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_ROUNDING=1
+          <toolset>intel:<pch>off
         : test_binomial_real_concept1 ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_ROUNDING=2
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_ROUNDING=2
+          <toolset>intel:<pch>off
         : test_binomial_real_concept2 ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_ROUNDING=3
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_ROUNDING=3
+          <toolset>intel:<pch>off
         : test_binomial_real_concept3 ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_ROUNDING=4
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_ROUNDING=4
+          <toolset>intel:<pch>off
         : test_binomial_real_concept4 ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_ROUNDING=5
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_ROUNDING=5
+          <toolset>intel:<pch>off
         : test_binomial_real_concept5 ;
-run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
+run test_binomial.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_ROUNDING=6
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_ROUNDING=6
+          <toolset>intel:<pch>off
         : test_binomial_real_concept6 ;
-run test_binomial_coeff.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_carlson.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_cauchy.cpp ../../test/build//boost_test_exec_monitor ;
-run test_cbrt.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_chi_squared.cpp ../../test/build//boost_test_exec_monitor ;
-run test_classify.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_digamma.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_dist_overloads.cpp ../../test/build//boost_test_exec_monitor ;
-run test_ellint_1.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_ellint_2.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_ellint_3.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_erf.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_error_handling.cpp ../../test/build//boost_test_exec_monitor ;
-run test_expint.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_exponential_dist.cpp ../../test/build//boost_test_exec_monitor ;
-run test_extreme_value.cpp ../../test/build//boost_test_exec_monitor ;
-run test_factorials.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_find_location.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_find_scale.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_fisher_f.cpp ../../test/build//boost_test_exec_monitor ;
-run test_gamma.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_gamma_dist.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_geometric.cpp ../../test/build//boost_test_exec_monitor ;
-run test_hankel.cpp ../../test/build//boost_test_exec_monitor ;
-run test_hermite.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
+run test_binomial_coeff.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_carlson.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_cauchy.cpp ../../test/build//boost_unit_test_framework ;
+run test_cbrt.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_chi_squared.cpp ../../test/build//boost_unit_test_framework ;
+run test_classify.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_digamma.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_dist_overloads.cpp ../../test/build//boost_unit_test_framework ;
+run test_ellint_1.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_ellint_2.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_ellint_3.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_erf.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_error_handling.cpp ../../test/build//boost_unit_test_framework ;
+run test_expint.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_exponential_dist.cpp ../../test/build//boost_unit_test_framework ;
+run test_extreme_value.cpp ../../test/build//boost_unit_test_framework ;
+run test_factorials.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_find_location.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_find_scale.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_fisher_f.cpp ../../test/build//boost_unit_test_framework ;
+run test_gamma.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_gamma_dist.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_geometric.cpp ../../test/build//boost_unit_test_framework ;
+run test_hankel.cpp ../../test/build//boost_unit_test_framework ;
+run test_hermite.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_hypergeometric_dist.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_QUANT=0
-	      <toolset>intel:<pch>off
+          <define>TEST_QUANT=0
+          <toolset>intel:<pch>off
         : test_hypergeometric_dist0 ;
-run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
+run test_hypergeometric_dist.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_QUANT=1
-	      <toolset>intel:<pch>off
+          <define>TEST_QUANT=1
+          <toolset>intel:<pch>off
         : test_hypergeometric_dist1 ;
-run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
+run test_hypergeometric_dist.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_QUANT=2
-	      <toolset>intel:<pch>off
+          <define>TEST_QUANT=2
+          <toolset>intel:<pch>off
         : test_hypergeometric_dist2 ;
-run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
+run test_hypergeometric_dist.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_QUANT=3
-	      <toolset>intel:<pch>off
+          <define>TEST_QUANT=3
+          <toolset>intel:<pch>off
         : test_hypergeometric_dist3 ;
-run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
+run test_hypergeometric_dist.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_QUANT=4
-	      <toolset>intel:<pch>off
+          <define>TEST_QUANT=4
+          <toolset>intel:<pch>off
         : test_hypergeometric_dist4 ;
-run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
+run test_hypergeometric_dist.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_QUANT=5
-	      <toolset>intel:<pch>off
+          <define>TEST_QUANT=5
+          <toolset>intel:<pch>off
         : test_hypergeometric_dist5 ;
-run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_ibeta_float ;
-run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_ibeta_double ;
-run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_ibeta_long_double ;
-run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=1
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=1
+          <toolset>intel:<pch>off
         : test_ibeta_real_concept1 ;
-run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=2
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=2
+          <toolset>intel:<pch>off
         : test_ibeta_real_concept2 ;
-run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=3
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=3
+          <toolset>intel:<pch>off
         : test_ibeta_real_concept3 ;
-run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=4
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=4
+          <toolset>intel:<pch>off
         : test_ibeta_real_concept4 ;
-run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_ibeta_inv_float ;
-run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_ibeta_inv_double ;
-run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_ibeta_inv_long_double ;
-run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=1
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=1
+          <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept1 ;
-run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=2
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=2
+          <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept2 ;
-run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=3
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=3
+          <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept3 ;
-run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=4
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=4
+          <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept4 ;
-run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_ibeta_inv_ab_float ;
-run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_ibeta_inv_ab_double ;
-run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_ibeta_inv_ab_long_double ;
-run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=1
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=1
+          <toolset>intel:<pch>off
         : test_ibeta_inv_ab_real_concept1 ;
-run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=2
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=2
+          <toolset>intel:<pch>off
         : test_ibeta_inv_ab_real_concept2 ;
-run test_ibeta_inv_ab.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=3
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=3
+          <toolset>intel:<pch>off
         : test_ibeta_inv_ab_real_concept3 ;
-run test_igamma.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_igamma_inv.cpp test_instances//test_instances pch_light  ../../test/build//boost_test_exec_monitor
+run test_igamma.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_igamma_inv.cpp test_instances//test_instances pch_light  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_igamma_inv_float ;
-run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_igamma_inv_double ;
-run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_igamma_inv_long_double ;
-run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <toolset>intel:<pch>off
         : test_igamma_inv_real_concept ;
-run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_igamma_inva_float ;
-run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_igamma_inva_double ;
-run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_igamma_inva_long_double ;
-run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <toolset>intel:<pch>off
         : test_igamma_inva_real_concept ;
 run test_instantiate1.cpp test_instantiate2.cpp ;
-run test_inverse_chi_squared_distribution.cpp ../../test/build//boost_test_exec_monitor ;
-run test_inverse_gamma_distribution.cpp ../../test/build//boost_test_exec_monitor ;
+run test_inverse_chi_squared_distribution.cpp ../../test/build//boost_unit_test_framework ;
+run test_inverse_gamma_distribution.cpp ../../test/build//boost_unit_test_framework ;
 
-run test_inverse_gaussian.cpp ../../test/build//boost_test_exec_monitor ;
+run test_inverse_gaussian.cpp ../../test/build//boost_unit_test_framework ;
 
-run test_jacobi.cpp pch_light ../../test/build//boost_test_exec_monitor ;
+run test_jacobi.cpp pch_light ../../test/build//boost_unit_test_framework ;
 run test_laplace.cpp ../../test/build//boost_unit_test_framework ;
-run test_inv_hyp.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_laguerre.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_legendre.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_logistic_dist.cpp ../../test/build//boost_test_exec_monitor ;
-run test_lognormal.cpp ../../test/build//boost_test_exec_monitor ;
-run test_minima.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_negative_binomial.cpp ../../test/build//boost_test_exec_monitor
+run test_inv_hyp.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_laguerre.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_legendre.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_logistic_dist.cpp ../../test/build//boost_unit_test_framework ;
+run test_lognormal.cpp ../../test/build//boost_unit_test_framework ;
+run test_minima.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_negative_binomial.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_negative_binomial_float ;
-run test_negative_binomial.cpp ../../test/build//boost_test_exec_monitor
+run test_negative_binomial.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_negative_binomial_double ;
-run test_negative_binomial.cpp ../../test/build//boost_test_exec_monitor
+run test_negative_binomial.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_negative_binomial_long_double ;
-run test_negative_binomial.cpp ../../test/build//boost_test_exec_monitor
+run test_negative_binomial.cpp ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <toolset>intel:<pch>off
         : test_negative_binomial_real_concept ;
-run test_next.cpp pch pch ../../test/build//boost_test_exec_monitor ;
-run test_nc_chi_squared.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_next.cpp pch pch ../../test/build//boost_unit_test_framework ;
+run test_nc_chi_squared.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_nc_chi_squared_float ;
-run test_nc_chi_squared.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_nc_chi_squared.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_nc_chi_squared_double ;
-run test_nc_chi_squared.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_nc_chi_squared.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_nc_chi_squared_long_double ;
-run test_nc_chi_squared.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_nc_chi_squared.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <toolset>intel:<pch>off
         : test_nc_chi_squared_real_concept ;
-run test_nc_beta.cpp  ../../test/build//boost_test_exec_monitor
+run test_nc_beta.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_nc_beta_float ;
-run test_nc_beta.cpp  ../../test/build//boost_test_exec_monitor
+run test_nc_beta.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_nc_beta_double ;
-run test_nc_beta.cpp  ../../test/build//boost_test_exec_monitor
+run test_nc_beta.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_nc_beta_long_double ;
-run test_nc_beta.cpp  ../../test/build//boost_test_exec_monitor
+run test_nc_beta.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=1
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=1
+          <toolset>intel:<pch>off
         : test_nc_beta_real_concept1 ;
-run test_nc_beta.cpp  ../../test/build//boost_test_exec_monitor
+run test_nc_beta.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <define>TEST_DATA=2
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <define>TEST_DATA=2
+          <toolset>intel:<pch>off
         : test_nc_beta_real_concept2 ;
-run test_nc_f.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_nc_t.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_nc_f.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_nc_t.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_nc_t_float ;
-run test_nc_t.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_nc_t.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_nc_t_double ;
-run test_nc_t.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_nc_t.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_nc_t_long_double ;
-run test_nc_t.cpp  pch ../../test/build//boost_test_exec_monitor
+run test_nc_t.cpp  pch ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <toolset>intel:<pch>off
         : test_nc_t_real_concept ;
-run test_normal.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_owens_t.cpp ../../test/build//boost_test_exec_monitor ;
-run test_pareto.cpp ../../test/build//boost_test_exec_monitor ;
-run test_poisson.cpp ../../test/build//boost_test_exec_monitor 
+run test_normal.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_owens_t.cpp ../../test/build//boost_unit_test_framework ;
+run test_pareto.cpp ../../test/build//boost_unit_test_framework ;
+run test_poisson.cpp ../../test/build//boost_unit_test_framework 
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_FLOAT
-	      <toolset>intel:<pch>off
+          <define>TEST_FLOAT
+          <toolset>intel:<pch>off
         : test_poisson_float ;
-run test_poisson.cpp  ../../test/build//boost_test_exec_monitor
+run test_poisson.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_DOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_DOUBLE
+          <toolset>intel:<pch>off
         : test_poisson_double ;
-run test_poisson.cpp  ../../test/build//boost_test_exec_monitor
+run test_poisson.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_LDOUBLE
-	      <toolset>intel:<pch>off
+          <define>TEST_LDOUBLE
+          <toolset>intel:<pch>off
         : test_poisson_long_double ;
-run test_poisson.cpp  ../../test/build//boost_test_exec_monitor
+run test_poisson.cpp  ../../test/build//boost_unit_test_framework
         : # command line
         : # input files
         : # requirements
-	      <define>TEST_REAL_CONCEPT
-	      <toolset>intel:<pch>off
+          <define>TEST_REAL_CONCEPT
+          <toolset>intel:<pch>off
         : test_poisson_real_concept ;
-run test_rayleigh.cpp ../../test/build//boost_test_exec_monitor ;
+run test_rayleigh.cpp ../../test/build//boost_unit_test_framework ;
 
-run test_rationals.cpp ../../test/build//boost_test_exec_monitor 
+run test_rationals.cpp ../../test/build//boost_unit_test_framework 
 test_rational_instances/test_rational_double1.cpp
 test_rational_instances/test_rational_double2.cpp
 test_rational_instances/test_rational_double3.cpp
@@ -632,43 +632,43 @@
 test_rational_instances/test_rational_real_concept5.cpp
 ;
 
-run test_real_concept.cpp ../../test/build//boost_test_exec_monitor ;
-run test_remez.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_roots.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_round.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_spherical_harmonic.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_students_t.cpp ../../test/build//boost_test_exec_monitor ;
-run test_sign.cpp ../../test/build//boost_test_exec_monitor ;
-run test_skew_normal.cpp ../../test/build//boost_test_exec_monitor ;
-run test_tgamma_ratio.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_toms748_solve.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_triangular.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_uniform.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_weibull.cpp ../../test/build//boost_test_exec_monitor ;
-run test_zeta.cpp test_instances//test_instances ../../test/build//boost_test_exec_monitor pch_light ;
-
-run test_policy.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_2.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_3.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_4.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_5.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_6.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_7.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_8.cpp ../../test/build//boost_test_exec_monitor ;
-run test_policy_sf.cpp ../../test/build//boost_test_exec_monitor ;
+run test_real_concept.cpp ../../test/build//boost_unit_test_framework ;
+run test_remez.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_roots.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_round.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_spherical_harmonic.cpp test_instances//test_instances pch_light ../../test/build//boost_unit_test_framework ;
+run test_students_t.cpp ../../test/build//boost_unit_test_framework ;
+run test_sign.cpp ../../test/build//boost_unit_test_framework ;
+run test_skew_normal.cpp ../../test/build//boost_unit_test_framework ;
+run test_tgamma_ratio.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_toms748_solve.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_triangular.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_uniform.cpp pch ../../test/build//boost_unit_test_framework ;
+run test_weibull.cpp ../../test/build//boost_unit_test_framework ;
+run test_zeta.cpp test_instances//test_instances ../../test/build//boost_unit_test_framework pch_light ;
+
+run test_policy.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_2.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_3.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_4.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_5.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_6.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_7.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_8.cpp ../../test/build//boost_unit_test_framework ;
+run test_policy_sf.cpp ../../test/build//boost_unit_test_framework ;
 
 run test_tr1.cpp
    ../build//boost_math_tr1
    ../build//boost_math_tr1f
    ../build//boost_math_c99
    ../build//boost_math_c99f
-   ../../test/build//boost_test_exec_monitor 
+   ../../test/build//boost_unit_test_framework 
    ;
 
 run test_tr1.cpp
    ../build//boost_math_tr1l 
    ../build//boost_math_c99l 
-   ../../test/build//boost_test_exec_monitor 
+   ../../test/build//boost_unit_test_framework 
    : : :
    <define>TEST_LD=1
    [ check-target-builds ../config//has_long_double_support : : <build>no ]
@@ -681,7 +681,7 @@
    ../build//boost_math_tr1f
    ../build//boost_math_c99
    ../build//boost_math_c99f
-   ../../test/build//boost_test_exec_monitor 
+   ../../test/build//boost_unit_test_framework 
    : : : #requirements
    :
    test_tr1_c
@@ -690,7 +690,7 @@
 run test_tr1.c
    ../build//boost_math_tr1l 
    ../build//boost_math_c99l 
-   ../../test/build//boost_test_exec_monitor 
+   ../../test/build//boost_unit_test_framework 
    : : :
    <define>TEST_LD=1
    [ check-target-builds ../config//has_long_double_support : : <build>no ]
@@ -698,7 +698,7 @@
    test_tr1_c_long_double
    ;
 
-run test_long_double_support.cpp ../../test/build//boost_test_exec_monitor 
+run test_long_double_support.cpp ../../test/build//boost_unit_test_framework 
 : : : [ check-target-builds ../config//has_long_double_support : : <build>no ] ;
 
 run  compile_test/compl_abs_incl_test.cpp compile_test/main.cpp ;
@@ -815,13 +815,13 @@
     ../../test/build//boost_unit_test_framework ;
     
     
-run test_legacy_nonfinite.cpp ../../test/build//boost_test_exec_monitor ;
-run test_basic_nonfinite.cpp ../../test/build//boost_test_exec_monitor ;
-run test_lexical_cast.cpp ../../test/build//boost_test_exec_monitor ;
-run test_nonfinite_trap.cpp ../../test/build//boost_test_exec_monitor ;
-run test_signed_zero.cpp ../../test/build//boost_test_exec_monitor ;
+run test_legacy_nonfinite.cpp ../../test/build//boost_unit_test_framework ;
+run test_basic_nonfinite.cpp ../../test/build//boost_unit_test_framework ;
+run test_lexical_cast.cpp ../../test/build//boost_unit_test_framework ;
+run test_nonfinite_trap.cpp ../../test/build//boost_unit_test_framework ;
+run test_signed_zero.cpp ../../test/build//boost_unit_test_framework ;
   
-run complex_test.cpp ../../test/build//boost_test_exec_monitor ;
+run complex_test.cpp ../../test/build//boost_unit_test_framework ;
 
 compile multiprc_concept_check_1.cpp : <debug-symbols>off ;
 compile multiprc_concept_check_2.cpp : <debug-symbols>off ;
Modified: trunk/libs/math/test/acosh_test.hpp
==============================================================================
--- trunk/libs/math/test/acosh_test.hpp	(original)
+++ trunk/libs/math/test/acosh_test.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -10,7 +10,7 @@
 #include <iomanip>
 #include <iostream>
 
-
+#define BOOST_TEST_MAiN
 #include <boost/math/special_functions/acosh.hpp>
 
 
Modified: trunk/libs/math/test/asinh_test.hpp
==============================================================================
--- trunk/libs/math/test/asinh_test.hpp	(original)
+++ trunk/libs/math/test/asinh_test.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -10,7 +10,7 @@
 #include <iomanip>
 #include <iostream>
 
-
+#define BOOST_TEST_MAiN
 #include <boost/math/special_functions/asinh.hpp>
 
 
Modified: trunk/libs/math/test/atanh_test.hpp
==============================================================================
--- trunk/libs/math/test/atanh_test.hpp	(original)
+++ trunk/libs/math/test/atanh_test.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -10,7 +10,7 @@
 #include <iomanip>
 //#include <iostream>
 
-
+#define BOOST_TEST_MAiN
 #include <boost/math/special_functions/atanh.hpp>
 
 
Modified: trunk/libs/math/test/complex_test.cpp
==============================================================================
--- trunk/libs/math/test/complex_test.cpp	(original)
+++ trunk/libs/math/test/complex_test.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -3,8 +3,8 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/test/test_tools.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
@@ -896,7 +896,7 @@
 }
 
 
-int test_main(int, char*[])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    std::cout << "Running complex trig sanity checks for type float." << std::endl;
    test_inverse_trig(float(0));
@@ -915,7 +915,6 @@
 
    std::cout << "Running complex trig boundary and accuracy tests." << std::endl;
    test_boundaries();
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/hypot_test.cpp
==============================================================================
--- trunk/libs/math/test/hypot_test.cpp	(original)
+++ trunk/libs/math/test/hypot_test.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 #include <pch_light.hpp>
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN 
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 
@@ -121,10 +122,9 @@
    }
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    test_boundaries();
    test_spots();
-   return 0;
 }
Modified: trunk/libs/math/test/log1p_expm1_test.cpp
==============================================================================
--- trunk/libs/math/test/log1p_expm1_test.cpp	(original)
+++ trunk/libs/math/test/log1p_expm1_test.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -12,7 +12,8 @@
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include "log1p_expm1_test.hpp"
@@ -66,7 +67,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -88,6 +89,5 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
Modified: trunk/libs/math/test/pch.hpp
==============================================================================
--- trunk/libs/math/test/pch.hpp	(original)
+++ trunk/libs/math/test/pch.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,8 +6,6 @@
 #ifdef BOOST_BUILD_PCH_ENABLED
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/test/test_exec_monitor.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions.hpp>
 #include <boost/math/distributions.hpp>
 #include <boost/math/tools/test.hpp>
Modified: trunk/libs/math/test/pch_light.hpp
==============================================================================
--- trunk/libs/math/test/pch_light.hpp	(original)
+++ trunk/libs/math/test/pch_light.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,8 +6,6 @@
 #ifdef BOOST_BUILD_PCH_ENABLED
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/test/test_exec_monitor.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/stats.hpp>
Modified: trunk/libs/math/test/pow_test.cpp
==============================================================================
--- trunk/libs/math/test/pow_test.cpp	(original)
+++ trunk/libs/math/test/pow_test.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -11,7 +11,8 @@
 #include <iostream>
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/typeof/typeof.hpp>
@@ -141,7 +142,7 @@
                 == 456.78);
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     using namespace std;
 
@@ -195,8 +196,6 @@
     test_return_types();
 
     test_error_policy();
-
-    return 0;
 }
 
 /*
Modified: trunk/libs/math/test/powm1_sqrtp1m1_test.cpp
==============================================================================
--- trunk/libs/math/test/powm1_sqrtp1m1_test.cpp	(original)
+++ trunk/libs/math/test/powm1_sqrtp1m1_test.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 #include <pch_light.hpp>
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/test.hpp>
@@ -55,7 +56,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -72,7 +73,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/sinc_test.hpp
==============================================================================
--- trunk/libs/math/test/sinc_test.hpp	(original)
+++ trunk/libs/math/test/sinc_test.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -14,7 +14,7 @@
 
 #include <boost/math/special_functions/sinc.hpp>
 
-
+#define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 
 
Modified: trunk/libs/math/test/sinhc_test.hpp
==============================================================================
--- trunk/libs/math/test/sinhc_test.hpp	(original)
+++ trunk/libs/math/test/sinhc_test.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -14,7 +14,7 @@
 
 #include <boost/math/special_functions/sinhc.hpp>
 
-
+#define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 
 
Modified: trunk/libs/math/test/test_airy.cpp
==============================================================================
--- trunk/libs/math/test/test_airy.cpp	(original)
+++ trunk/libs/math/test/test_airy.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 #include <pch_light.hpp>
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/concepts/real_concept.hpp>
@@ -57,7 +58,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifdef TEST_GSL
    gsl_set_error_handler_off();
@@ -77,7 +78,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_bernoulli.cpp
==============================================================================
--- trunk/libs/math/test/test_bernoulli.cpp	(original)
+++ trunk/libs/math/test/test_bernoulli.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -26,7 +26,8 @@
 #include <boost/math/distributions/bernoulli.hpp> // for bernoulli_distribution
 using boost::math::bernoulli_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
 
 #include <iostream>
@@ -260,7 +261,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    // Check that can generate bernoulli distribution using both convenience methods:
@@ -295,8 +296,7 @@
   test_spots(boost::math::concepts::real_concept(0.)); // Test real concept.
 #endif
 
-  return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_bessel_airy_zeros.cpp
==============================================================================
--- trunk/libs/math/test/test_bessel_airy_zeros.cpp	(original)
+++ trunk/libs/math/test/test_bessel_airy_zeros.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -18,7 +18,8 @@
 #include <boost/math/special_functions/airy.hpp>
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 
@@ -59,12 +60,12 @@
 
 So I would be most interested in various regions of order,
 each one tested with about 20 zeros should suffice:
-	Order 219/100: This checks a region just below a critical cutoff
-	Order 221/100: This checks a region just above a critical cutoff
-	Order 0: Something always tends to go wrong at zero.
-	Order 1/1000: A small order
-	Order 71/19: Merely an intermediate order.
-	Order 7001/19: A medium-large order, small enough to retain moderate efficiency of calculation.
+   Order 219/100: This checks a region just below a critical cutoff
+   Order 221/100: This checks a region just above a critical cutoff
+   Order 0: Something always tends to go wrong at zero.
+   Order 1/1000: A small order
+   Order 71/19: Merely an intermediate order.
+   Order 7001/19: A medium-large order, small enough to retain moderate efficiency of calculation.
  
 If we would like, we could add a few selected high zeros
 such as the 1000th zero for a few modest orders such as 71/19, etc.
Modified: trunk/libs/math/test/test_bessel_i.cpp
==============================================================================
--- trunk/libs/math/test/test_bessel_i.cpp	(original)
+++ trunk/libs/math/test/test_bessel_i.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -110,7 +110,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifdef TEST_GSL
    gsl_set_error_handler_off();
@@ -133,7 +133,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_bessel_i.hpp
==============================================================================
--- trunk/libs/math/test/test_bessel_i.hpp	(original)
+++ trunk/libs/math/test/test_bessel_i.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
Modified: trunk/libs/math/test/test_bessel_j.cpp
==============================================================================
--- trunk/libs/math/test/test_bessel_j.cpp	(original)
+++ trunk/libs/math/test/test_bessel_j.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -281,7 +281,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifdef TEST_GSL
    gsl_set_error_handler_off();
@@ -302,7 +302,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_bessel_j.hpp
==============================================================================
--- trunk/libs/math/test/test_bessel_j.hpp	(original)
+++ trunk/libs/math/test/test_bessel_j.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
Modified: trunk/libs/math/test/test_bessel_k.cpp
==============================================================================
--- trunk/libs/math/test/test_bessel_k.cpp	(original)
+++ trunk/libs/math/test/test_bessel_k.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -101,7 +101,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifdef TEST_GSL
    gsl_set_error_handler_off();
@@ -124,7 +124,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_bessel_k.hpp
==============================================================================
--- trunk/libs/math/test/test_bessel_k.hpp	(original)
+++ trunk/libs/math/test/test_bessel_k.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
Modified: trunk/libs/math/test/test_bessel_y.cpp
==============================================================================
--- trunk/libs/math/test/test_bessel_y.cpp	(original)
+++ trunk/libs/math/test/test_bessel_y.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -239,7 +239,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifdef TEST_GSL
    gsl_set_error_handler_off();
@@ -262,7 +262,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_bessel_y.hpp
==============================================================================
--- trunk/libs/math/test/test_bessel_y.hpp	(original)
+++ trunk/libs/math/test/test_bessel_y.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
Modified: trunk/libs/math/test/test_beta.cpp
==============================================================================
--- trunk/libs/math/test/test_beta.cpp	(original)
+++ trunk/libs/math/test/test_beta.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -100,7 +100,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -133,7 +133,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_beta.hpp
==============================================================================
--- trunk/libs/math/test/test_beta.hpp	(original)
+++ trunk/libs/math/test/test_beta.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -11,7 +11,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
Modified: trunk/libs/math/test/test_beta_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_beta_dist.cpp	(original)
+++ trunk/libs/math/test/test_beta_dist.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -39,7 +39,8 @@
 using boost::math::beta_distribution;
 using boost::math::beta;
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 
 #include "test_out_of_range.hpp"
@@ -523,7 +524,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    // Check that can generate beta distribution using one convenience methods:
@@ -615,8 +616,7 @@
    test_spots(boost::math::concepts::real_concept(0.)); // Test real concept.
 #endif
 #endif
-   return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_binomial.cpp
==============================================================================
--- trunk/libs/math/test/test_binomial.cpp	(original)
+++ trunk/libs/math/test/test_binomial.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -33,7 +33,8 @@
 #include <boost/math/distributions/binomial.hpp> // for binomial_distribution
 using boost::math::binomial_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "table_type.hpp"
 
@@ -717,7 +718,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    // Check that can generate binomial distribution using one convenience methods:
@@ -751,8 +752,7 @@
       "to pass.</note>" << std::cout;
 #endif
 
-  return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_binomial_coeff.cpp
==============================================================================
--- trunk/libs/math/test/test_binomial_coeff.cpp	(original)
+++ trunk/libs/math/test/test_binomial_coeff.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -111,7 +111,7 @@
    BOOST_CHECK_CLOSE(boost::math::binomial_coefficient<T>(300, 275), static_cast<T>(1.953265141442868389822364184842211512000000e36L), tolerance);
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -136,7 +136,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_binomial_coeff.hpp
==============================================================================
--- trunk/libs/math/test/test_binomial_coeff.hpp	(original)
+++ trunk/libs/math/test/test_binomial_coeff.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/binomial.hpp>
 #include <boost/math/special_functions/trunc.hpp>
Modified: trunk/libs/math/test/test_carlson.cpp
==============================================================================
--- trunk/libs/math/test/test_carlson.cpp	(original)
+++ trunk/libs/math/test/test_carlson.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -112,7 +112,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     expected_results();
     BOOST_MATH_CONTROL_FP;
@@ -132,8 +132,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-
-    return 0;
 }
 
 /*
Modified: trunk/libs/math/test/test_carlson.hpp
==============================================================================
--- trunk/libs/math/test/test_carlson.hpp	(original)
+++ trunk/libs/math/test/test_carlson.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
Modified: trunk/libs/math/test/test_cauchy.cpp
==============================================================================
--- trunk/libs/math/test/test_cauchy.cpp	(original)
+++ trunk/libs/math/test/test_cauchy.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -25,7 +25,8 @@
 
 #include "test_out_of_range.hpp"
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <iostream>
@@ -695,7 +696,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   BOOST_MATH_CONTROL_FP;
    // Check that can generate cauchy distribution using the two convenience methods:
@@ -721,8 +722,7 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 Output:
Modified: trunk/libs/math/test/test_cbrt.cpp
==============================================================================
--- trunk/libs/math/test/test_cbrt.cpp	(original)
+++ trunk/libs/math/test/test_cbrt.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -73,7 +73,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -85,6 +85,5 @@
    test_cbrt(boost::math::concepts::real_concept(0.1), "real_concept");
 #endif
 #endif
-   return 0;
 }
 
Modified: trunk/libs/math/test/test_cbrt.hpp
==============================================================================
--- trunk/libs/math/test/test_cbrt.hpp	(original)
+++ trunk/libs/math/test/test_cbrt.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
Modified: trunk/libs/math/test/test_chi_squared.cpp
==============================================================================
--- trunk/libs/math/test/test_chi_squared.cpp	(original)
+++ trunk/libs/math/test/test_chi_squared.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -23,7 +23,8 @@
 using boost::math::chi_squared_distribution;
 using boost::math::chi_squared;
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 
 #include "test_out_of_range.hpp"
@@ -534,7 +535,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   BOOST_MATH_CONTROL_FP;
   // Check that can generate chi_squared distribution using the two convenience methods:
@@ -552,8 +553,7 @@
   test_spots(boost::math::concepts::real_concept(0.)); // Test real concept.
 #endif
 #endif
-  return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_classify.cpp
==============================================================================
--- trunk/libs/math/test/test_classify.cpp	(original)
+++ trunk/libs/math/test/test_classify.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -11,7 +11,8 @@
 #include <boost/limits.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 
 #ifdef _MSC_VER
 #pragma warning(disable: 4127 4146) //  conditional expression is constant
@@ -250,7 +251,7 @@
 #endif
 }
 
-int test_main(int, char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    // start by printing some information:
@@ -279,7 +280,6 @@
    // We should test with integer types as well:
    test_classify(int(0), "int");
    test_classify(unsigned(0), "unsigned");
-  return 0;
 }
 
 /*
Modified: trunk/libs/math/test/test_constants.cpp
==============================================================================
--- trunk/libs/math/test/test_constants.cpp	(original)
+++ trunk/libs/math/test/test_constants.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -20,7 +20,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/constants/constants.hpp>
@@ -751,7 +752,7 @@
 
 } // template <class boost::math::concepts::real_concept>void test_spots(boost::math::concepts::real_concept)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    // Basic sanity-check spot values.
 
@@ -780,8 +781,7 @@
     "to pass.</note>" << std::cout;
 #endif
 
-  return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_digamma.cpp
==============================================================================
--- trunk/libs/math/test/test_digamma.cpp	(original)
+++ trunk/libs/math/test/test_digamma.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -89,7 +89,7 @@
    BOOST_CHECK_CLOSE(::boost::math::digamma(static_cast<T>(-1.5)), static_cast<T>(0.70315664064524318722569033366791109947350706200623L), tolerance);
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    test_spots(0.0F, "float");
@@ -114,7 +114,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_digamma.hpp
==============================================================================
--- trunk/libs/math/test/test_digamma.hpp	(original)
+++ trunk/libs/math/test/test_digamma.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
Modified: trunk/libs/math/test/test_dist_overloads.cpp
==============================================================================
--- trunk/libs/math/test/test_dist_overloads.cpp	(original)
+++ trunk/libs/math/test/test_dist_overloads.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -12,7 +12,8 @@
 #include <boost/math/distributions/normal.hpp>
     using boost::math::normal_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <iostream>
@@ -65,7 +66,7 @@
    }
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     // Basic sanity-check spot values.
    // (Parameter value, arbitrarily zero, only communicates the floating point type).
@@ -83,8 +84,7 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_ellint_1.cpp
==============================================================================
--- trunk/libs/math/test/test_ellint_1.cpp	(original)
+++ trunk/libs/math/test/test_ellint_1.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -79,7 +79,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     expected_results();
     BOOST_MATH_CONTROL_FP;
@@ -98,5 +98,4 @@
       "to pass.</note>" << std::cout;
 #endif
 
-    return 0;
 }
Modified: trunk/libs/math/test/test_ellint_1.hpp
==============================================================================
--- trunk/libs/math/test/test_ellint_1.hpp	(original)
+++ trunk/libs/math/test/test_ellint_1.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -10,7 +10,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
Modified: trunk/libs/math/test/test_ellint_2.cpp
==============================================================================
--- trunk/libs/math/test/test_ellint_2.cpp	(original)
+++ trunk/libs/math/test/test_ellint_2.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -79,7 +79,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     expected_results();
     BOOST_MATH_CONTROL_FP;
@@ -99,5 +99,4 @@
       "to pass.</note>" << std::cout;
 #endif
 
-    return 0;
 }
Modified: trunk/libs/math/test/test_ellint_2.hpp
==============================================================================
--- trunk/libs/math/test/test_ellint_2.hpp	(original)
+++ trunk/libs/math/test/test_ellint_2.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -10,7 +10,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
Modified: trunk/libs/math/test/test_ellint_3.cpp
==============================================================================
--- trunk/libs/math/test/test_ellint_3.cpp	(original)
+++ trunk/libs/math/test/test_ellint_3.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -92,7 +92,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     expected_results();
     BOOST_MATH_CONTROL_FP;
@@ -110,5 +110,4 @@
       "to pass.</note>" << std::cout;
 #endif
 
-    return 0;
 }
Modified: trunk/libs/math/test/test_ellint_3.hpp
==============================================================================
--- trunk/libs/math/test/test_ellint_3.hpp	(original)
+++ trunk/libs/math/test/test_ellint_3.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -10,7 +10,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
Modified: trunk/libs/math/test/test_erf.cpp
==============================================================================
--- trunk/libs/math/test/test_erf.cpp	(original)
+++ trunk/libs/math/test/test_erf.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -122,7 +122,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    test_spots(0.0F, "float");
@@ -151,7 +151,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 /*
Modified: trunk/libs/math/test/test_erf.hpp
==============================================================================
--- trunk/libs/math/test/test_erf.hpp	(original)
+++ trunk/libs/math/test/test_erf.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
Modified: trunk/libs/math/test/test_error_handling.cpp
==============================================================================
--- trunk/libs/math/test/test_error_handling.cpp	(original)
+++ trunk/libs/math/test/test_error_handling.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -64,7 +64,8 @@
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/policies/policy.hpp>
 #include <boost/math/policies/error_handling.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <cerrno> // for errno
 //
 // Define some policies:
@@ -176,7 +177,7 @@
    BOOST_CHECK_EQUAL(errno, EDOM);
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    // Test error handling.
    // (Parameter value, arbitrarily zero, only communicates the floating point type FPT).
@@ -184,8 +185,7 @@
    test_error(0.0); // Test double.
    test_error(0.0L); // Test long double.
    test_error(boost::math::concepts::real_concept(0.0L)); // Test concepts.
-   return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_expint.cpp
==============================================================================
--- trunk/libs/math/test/test_expint.cpp	(original)
+++ trunk/libs/math/test/test_expint.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -121,7 +121,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -155,7 +155,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
 }
 
 
Modified: trunk/libs/math/test/test_expint.hpp
==============================================================================
--- trunk/libs/math/test/test_expint.hpp	(original)
+++ trunk/libs/math/test/test_expint.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
Modified: trunk/libs/math/test/test_exponential_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_exponential_dist.cpp	(original)
+++ trunk/libs/math/test/test_exponential_dist.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -12,7 +12,8 @@
 #include <boost/math/distributions/exponential.hpp>
     using boost::math::exponential_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
@@ -263,7 +264,7 @@
    }
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can generate exponential distribution using the two convenience methods:
    boost::math::exponential mycexp1(1.); // Using typedef
@@ -285,8 +286,7 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_extreme_value.cpp
==============================================================================
--- trunk/libs/math/test/test_extreme_value.cpp	(original)
+++ trunk/libs/math/test/test_extreme_value.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -11,7 +11,8 @@
 #include <boost/math/distributions/extreme_value.hpp>
     using boost::math::extreme_value_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
@@ -193,7 +194,7 @@
    }
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 
   // Check that can generate extreme_value distribution using the two convenience methods:
@@ -216,8 +217,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_factorials.cpp
==============================================================================
--- trunk/libs/math/test/test_factorials.cpp	(original)
+++ trunk/libs/math/test/test_factorials.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -14,7 +14,8 @@
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/factorials.hpp>
 #include <boost/math/special_functions/gamma.hpp>
@@ -286,7 +287,7 @@
    }
 } // template <class T> void test_spots(T)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    test_spots(0.0F);
@@ -321,7 +322,7 @@
 
 
 
-   return 0;
+   
 }
 
 /*
Modified: trunk/libs/math/test/test_find_location.cpp
==============================================================================
--- trunk/libs/math/test/test_find_location.cpp	(original)
+++ trunk/libs/math/test/test_find_location.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -29,7 +29,8 @@
 #include <boost/math/policies/policy.hpp>
   using boost::math::policies::policy;
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
 
 #include <iostream>
@@ -136,7 +137,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Basic sanity-check spot values.
 
@@ -154,8 +155,8 @@
         "not available at all, or because they are too inaccurate for these tests "
         "to pass.</note>" << std::cout;
   #endif
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_find_scale.cpp
==============================================================================
--- trunk/libs/math/test/test_find_scale.cpp	(original)
+++ trunk/libs/math/test/test_find_scale.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -29,7 +29,8 @@
 #include <boost/math/policies/policy.hpp>
   using boost::math::policies::policy;
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
 
 #include <iostream>
@@ -170,7 +171,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Basic sanity-check spot values.
 
@@ -188,8 +189,8 @@
         "not available at all, or because they are too inaccurate for these tests "
         "to pass.</note>" << std::cout;
   #endif
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_fisher_f.cpp
==============================================================================
--- trunk/libs/math/test/test_fisher_f.cpp	(original)
+++ trunk/libs/math/test/test_fisher_f.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -14,7 +14,8 @@
 #include <boost/math/distributions/fisher_f.hpp> // for fisher_f_distribution
 using boost::math::fisher_f_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "test_out_of_range.hpp"
 
@@ -502,7 +503,7 @@
    check_out_of_range<fisher_f_distribution<RealType> >(2, 3);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 
   // Check that can generate fisher distribution using the two convenience methods:
@@ -521,8 +522,8 @@
   test_spots(boost::math::concepts::real_concept(0.)); // Test real concept.
 #endif
 #endif
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_gamma.cpp
==============================================================================
--- trunk/libs/math/test/test_gamma.cpp	(original)
+++ trunk/libs/math/test/test_gamma.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -302,7 +302,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -333,7 +333,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_gamma.hpp
==============================================================================
--- trunk/libs/math/test/test_gamma.hpp	(original)
+++ trunk/libs/math/test/test_gamma.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
Modified: trunk/libs/math/test/test_gamma_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_gamma_dist.cpp	(original)
+++ trunk/libs/math/test/test_gamma_dist.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -18,7 +18,8 @@
 #include <pch.hpp> // include directory libs/math/src/tr1/ is needed.
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/gamma.hpp>
@@ -223,7 +224,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    // Basic sanity-check spot values.
    // (Parameter value, arbitrarily zero, only communicates the floating point type).
@@ -241,8 +242,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 /*
Modified: trunk/libs/math/test/test_geometric.cpp
==============================================================================
--- trunk/libs/math/test/test_geometric.cpp	(original)
+++ trunk/libs/math/test/test_geometric.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -35,7 +35,8 @@
 
 #include <boost/math/distributions/negative_binomial.hpp> // for some comparisons.
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 #include "test_out_of_range.hpp"
 
@@ -748,7 +749,7 @@
    return;
 } // template <class RealType> void test_spots(RealType) // Any floating-point type RealType.
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can generate geometric distribution using the two convenience methods:
    using namespace boost::math;
@@ -790,8 +791,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_hankel.cpp
==============================================================================
--- trunk/libs/math/test/test_hankel.cpp	(original)
+++ trunk/libs/math/test/test_hankel.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 #include <pch_light.hpp>
 
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/concepts/real_concept.hpp>
@@ -119,7 +120,7 @@
 template std::complex<double> boost::math::cyl_hankel_1<double, double, pol3>(double, double, const pol3&);
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifdef TEST_GSL
    gsl_set_error_handler_off();
@@ -138,7 +139,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_hermite.cpp
==============================================================================
--- trunk/libs/math/test/test_hermite.cpp	(original)
+++ trunk/libs/math/test/test_hermite.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -77,7 +77,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
 
@@ -109,7 +109,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_hermite.hpp
==============================================================================
--- trunk/libs/math/test/test_hermite.hpp	(original)
+++ trunk/libs/math/test/test_hermite.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -12,7 +12,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
Modified: trunk/libs/math/test/test_hypergeometric_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_hypergeometric_dist.cpp	(original)
+++ trunk/libs/math/test/test_hypergeometric_dist.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -11,7 +11,8 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/distributions/hypergeometric.hpp>
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
@@ -478,7 +479,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    // Basic sanity-check spot values.
@@ -497,6 +498,6 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
Modified: trunk/libs/math/test/test_ibeta.cpp
==============================================================================
--- trunk/libs/math/test/test_ibeta.cpp	(original)
+++ trunk/libs/math/test/test_ibeta.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -278,7 +278,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -323,7 +323,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_ibeta.hpp
==============================================================================
--- trunk/libs/math/test/test_ibeta.hpp	(original)
+++ trunk/libs/math/test/test_ibeta.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
Modified: trunk/libs/math/test/test_ibeta_inv.cpp
==============================================================================
--- trunk/libs/math/test/test_ibeta_inv.cpp	(original)
+++ trunk/libs/math/test/test_ibeta_inv.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -171,7 +171,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    expected_results();
@@ -214,7 +214,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_ibeta_inv.hpp
==============================================================================
--- trunk/libs/math/test/test_ibeta_inv.hpp	(original)
+++ trunk/libs/math/test/test_ibeta_inv.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
Modified: trunk/libs/math/test/test_ibeta_inv_ab.cpp
==============================================================================
--- trunk/libs/math/test/test_ibeta_inv_ab.cpp	(original)
+++ trunk/libs/math/test/test_ibeta_inv_ab.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -98,7 +98,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
 #ifdef TEST_GSL
@@ -126,6 +126,6 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
Modified: trunk/libs/math/test/test_ibeta_inv_ab.hpp
==============================================================================
--- trunk/libs/math/test/test_ibeta_inv_ab.hpp	(original)
+++ trunk/libs/math/test/test_ibeta_inv_ab.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -7,7 +7,8 @@
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
Modified: trunk/libs/math/test/test_igamma.cpp
==============================================================================
--- trunk/libs/math/test/test_igamma.cpp	(original)
+++ trunk/libs/math/test/test_igamma.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -323,7 +323,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -356,7 +356,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_igamma.hpp
==============================================================================
--- trunk/libs/math/test/test_igamma.hpp	(original)
+++ trunk/libs/math/test/test_igamma.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
Modified: trunk/libs/math/test/test_igamma_inv.cpp
==============================================================================
--- trunk/libs/math/test/test_igamma_inv.cpp	(original)
+++ trunk/libs/math/test/test_igamma_inv.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -174,7 +174,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -223,7 +223,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_igamma_inv.hpp
==============================================================================
--- trunk/libs/math/test/test_igamma_inv.hpp	(original)
+++ trunk/libs/math/test/test_igamma_inv.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
Modified: trunk/libs/math/test/test_igamma_inva.cpp
==============================================================================
--- trunk/libs/math/test/test_igamma_inva.cpp	(original)
+++ trunk/libs/math/test/test_igamma_inva.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -101,7 +101,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -131,7 +131,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_igamma_inva.hpp
==============================================================================
--- trunk/libs/math/test/test_igamma_inva.hpp	(original)
+++ trunk/libs/math/test/test_igamma_inva.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
Modified: trunk/libs/math/test/test_inv_hyp.cpp
==============================================================================
--- trunk/libs/math/test/test_inv_hyp.cpp	(original)
+++ trunk/libs/math/test/test_inv_hyp.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -9,7 +9,8 @@
 #include <boost/math/special_functions/acosh.hpp>
 #include <boost/math/special_functions/asinh.hpp>
 #include <boost/math/special_functions/atanh.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
@@ -250,7 +251,7 @@
    BOOST_CHECK_CLOSE(::boost::math::atanh(static_cast<T>(-0.5)), static_cast<T>(-0.549306144334054845697622618461262852323745278911374725867347L), tolerance);
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -282,7 +283,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_inverse_chi_squared.cpp
==============================================================================
--- trunk/libs/math/test/test_inverse_chi_squared.cpp	(original)
+++ trunk/libs/math/test/test_inverse_chi_squared.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -20,7 +20,8 @@
 using ::boost::math::concepts::real_concept;
 
 //#include <boost/math/tools/test.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 
 #include <boost/math/distributions/inverse_chi_squared.hpp> // for inverse_chisquared_distribution
@@ -305,7 +306,7 @@
 } // template <class RealType>void test_spots(RealType)
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   BOOST_MATH_CONTROL_FP;
 
@@ -497,8 +498,8 @@
 #endif
 
  /*    */
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_inverse_chi_squared_distribution.cpp
==============================================================================
--- trunk/libs/math/test/test_inverse_chi_squared_distribution.cpp	(original)
+++ trunk/libs/math/test/test_inverse_chi_squared_distribution.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -18,7 +18,8 @@
 using ::boost::math::concepts::real_concept;
 
 //#include <boost/math/tools/test.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 #include "test_out_of_range.hpp"
 
@@ -304,7 +305,7 @@
 } // template <class RealType>void test_spots(RealType)
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   BOOST_MATH_CONTROL_FP;
 
@@ -496,8 +497,8 @@
 #endif
 
  /*    */
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_inverse_gamma_distribution.cpp
==============================================================================
--- trunk/libs/math/test/test_inverse_gamma_distribution.cpp	(original)
+++ trunk/libs/math/test/test_inverse_gamma_distribution.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -18,7 +18,8 @@
 using ::boost::math::concepts::real_concept;
 
 //#include <boost/math/tools/test.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 #include "test_out_of_range.hpp"
 
@@ -327,7 +328,7 @@
    check_out_of_range<inverse_gamma_distribution<RealType> >(1, 1);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   BOOST_MATH_CONTROL_FP;
 
@@ -412,8 +413,8 @@
     "not available at all, or because they are too inaccurate for these tests "
     "to pass.</note>" << std::cout;
 #endif
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_inverse_gaussian.cpp
==============================================================================
--- trunk/libs/math/test/test_inverse_gaussian.cpp	(original)
+++ trunk/libs/math/test/test_inverse_gaussian.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -17,7 +17,8 @@
 //#include <pch.hpp> // include directory libs/math/src/tr1/ is needed.
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/inverse_gaussian.hpp>
@@ -161,7 +162,7 @@
     static_cast<RealType>(10), tolerance);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   using boost::math::inverse_gaussian;
   using boost::math::inverse_gaussian_distribution;
@@ -334,8 +335,8 @@
     "to pass.</note>" << std::cout;
 #endif
   /*      */
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_jacobi.cpp
==============================================================================
--- trunk/libs/math/test/test_jacobi.cpp	(original)
+++ trunk/libs/math/test/test_jacobi.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -112,7 +112,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     expected_results();
     BOOST_MATH_CONTROL_FP;
@@ -131,5 +131,5 @@
       "to pass.</note>" << std::cout;
 #endif
 
-    return 0;
+    
 }
Modified: trunk/libs/math/test/test_jacobi.hpp
==============================================================================
--- trunk/libs/math/test/test_jacobi.hpp	(original)
+++ trunk/libs/math/test/test_jacobi.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -10,7 +10,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
Modified: trunk/libs/math/test/test_laguerre.cpp
==============================================================================
--- trunk/libs/math/test/test_laguerre.cpp	(original)
+++ trunk/libs/math/test/test_laguerre.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -136,7 +136,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
 
@@ -166,7 +166,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_laguerre.hpp
==============================================================================
--- trunk/libs/math/test/test_laguerre.hpp	(original)
+++ trunk/libs/math/test/test_laguerre.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
Modified: trunk/libs/math/test/test_legendre.cpp
==============================================================================
--- trunk/libs/math/test/test_legendre.cpp	(original)
+++ trunk/libs/math/test/test_legendre.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -178,7 +178,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    test_spots(0.0F, "float");
@@ -203,7 +203,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_legendre.hpp
==============================================================================
--- trunk/libs/math/test/test_legendre.hpp	(original)
+++ trunk/libs/math/test/test_legendre.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -9,7 +9,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
Modified: trunk/libs/math/test/test_logistic_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_logistic_dist.cpp	(original)
+++ trunk/libs/math/test/test_logistic_dist.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -11,7 +11,8 @@
 #include <boost/math/distributions/logistic.hpp>
     using boost::math::logistic_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
@@ -315,7 +316,7 @@
 } // template <class RealType>void test_spots(RealType)
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can generate logistic distribution using the two convenience methods:
    boost::math::logistic mycexp1(1.); // Using typedef
@@ -337,6 +338,6 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
Modified: trunk/libs/math/test/test_lognormal.cpp
==============================================================================
--- trunk/libs/math/test/test_lognormal.cpp	(original)
+++ trunk/libs/math/test/test_lognormal.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -9,7 +9,8 @@
 // test_lognormal.cpp
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/lognormal.hpp>
@@ -260,7 +261,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 
    // Check that can generate lognormal distribution using the two convenience methods:
@@ -290,8 +291,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 Running 1 test case...
Modified: trunk/libs/math/test/test_long_double_support.cpp
==============================================================================
--- trunk/libs/math/test/test_long_double_support.cpp	(original)
+++ trunk/libs/math/test/test_long_double_support.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -9,7 +9,8 @@
 #include <math.h>
 #include <limits.h>
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
@@ -204,7 +205,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    std::cout << "Running tests with BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS "
@@ -218,6 +219,6 @@
    // (Parameter value, arbitrarily zero, only communicates the floating point type).
    test_spots(); // Test long double.
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
Modified: trunk/libs/math/test/test_minima.cpp
==============================================================================
--- trunk/libs/math/test/test_minima.cpp	(original)
+++ trunk/libs/math/test/test_minima.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 #include <pch.hpp>
 
 #include <boost/math/tools/minima.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 
@@ -48,14 +49,14 @@
    BOOST_CHECK_CLOSE(m.first, T(1.461632), T(0.1));
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    test_minima(0.1f, "float");
    test_minima(0.1, "double");
 #ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    test_minima(0.1L, "long double");
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_nc_beta.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_beta.cpp	(original)
+++ trunk/libs/math/test/test_nc_beta.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -26,7 +26,8 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/distributions/non_central_beta.hpp> // for chi_squared_distribution
 #include <boost/math/distributions/poisson.hpp> // for poisson_distribution
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
@@ -427,7 +428,7 @@
 #endif
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    // Basic sanity-check spot values.
@@ -466,6 +467,6 @@
 #endif
 #endif
 #endif
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
Modified: trunk/libs/math/test/test_nc_chi_squared.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_chi_squared.cpp	(original)
+++ trunk/libs/math/test/test_nc_chi_squared.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -23,7 +23,8 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/distributions/non_central_chi_squared.hpp> // for chi_squared_distribution
 #include <boost/math/special_functions/cbrt.hpp> // for chi_squared_distribution
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
@@ -518,7 +519,7 @@
     quantile_sanity_check<T>(nccs_big, type_name, "Non Central Chi Squared, large parameters");
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    // Basic sanity-check spot values.
@@ -557,7 +558,7 @@
 #endif
 #endif
 #endif
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
Modified: trunk/libs/math/test/test_nc_f.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_f.cpp	(original)
+++ trunk/libs/math/test/test_nc_f.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -22,7 +22,8 @@
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/distributions/non_central_f.hpp> // for chi_squared_distribution
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
@@ -294,7 +295,7 @@
    BOOST_CHECK_THROW(quantile(boost::math::non_central_f_distribution<RealType>(1, 1, 1), 2), std::domain_error);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    // Basic sanity-check spot values.
@@ -309,6 +310,6 @@
 #endif
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
Modified: trunk/libs/math/test/test_nc_t.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_t.cpp	(original)
+++ trunk/libs/math/test/test_nc_t.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -25,7 +25,8 @@
 #include <boost/math/distributions/non_central_t.hpp> // for chi_squared_distribution.
 #include <boost/math/distributions/normal.hpp> // for normal distribution (for comparison).
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
@@ -798,7 +799,7 @@
 } // template <class RealType> void test_ignore_policy(RealType)
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   BOOST_MATH_CONTROL_FP;
    // Basic sanity-check spot values.
@@ -843,8 +844,8 @@
    test_big_df(0.F); // float
    test_big_df(0.); // double
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_negative_binomial.cpp
==============================================================================
--- trunk/libs/math/test/test_negative_binomial.cpp	(original)
+++ trunk/libs/math/test/test_negative_binomial.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -35,7 +35,8 @@
 #include <boost/math/special_functions/gamma.hpp>
   using boost::math::lgamma;  // log gamma
 
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "table_type.hpp"
 #include "test_out_of_range.hpp"
@@ -798,7 +799,7 @@
   return;
 } // template <class RealType> void test_spots(RealType) // Any floating-point type RealType.
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can generate negative_binomial distribution using the two convenience methods:
   using namespace boost::math;
@@ -839,8 +840,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_next.cpp
==============================================================================
--- trunk/libs/math/test/test_next.cpp	(original)
+++ trunk/libs/math/test/test_next.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 #include <pch.hpp>
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/next.hpp>
 
@@ -148,7 +149,7 @@
    }
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    test_values(1.0f, "float");
    test_values(1.0, "double");
@@ -181,7 +182,7 @@
    test_values(1.0f, "float");
    test_values(1.0, "double");
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_normal.cpp
==============================================================================
--- trunk/libs/math/test/test_normal.cpp	(original)
+++ trunk/libs/math/test/test_normal.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -24,7 +24,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/normal.hpp>
@@ -292,7 +293,7 @@
     BOOST_CHECK_THROW(quantile(normal_distribution<RealType>(0, 1), 2), std::domain_error);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
     // Check that can generate normal distribution using the two convenience methods:
    boost::math::normal myf1(1., 2); // Using typedef
@@ -320,8 +321,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_owens_t.cpp
==============================================================================
--- trunk/libs/math/test/test_owens_t.cpp	(original)
+++ trunk/libs/math/test/test_owens_t.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -33,7 +33,8 @@
 using boost::math::owens_t;
 #include <boost/math/distributions/normal.hpp>
 
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/array.hpp>
 
@@ -267,7 +268,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   BOOST_MATH_CONTROL_FP;
 
@@ -308,8 +309,8 @@
   test_owens_t(boost::multiprecision::cpp_dec_float_50(0), "cpp_dec_float_50"); // Test real concept.
   test_owens_t(boost::multiprecision::cpp_dec_float_100(0), "cpp_dec_float_100"); // Test real concept.
 #endif
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_pareto.cpp
==============================================================================
--- trunk/libs/math/test/test_pareto.cpp	(original)
+++ trunk/libs/math/test/test_pareto.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -24,7 +24,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/pareto.hpp>
@@ -247,7 +248,7 @@
     BOOST_CHECK_THROW(quantile(pareto_distribution<RealType>(1, 1), 2), std::domain_error);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can generate pareto distribution using the two convenience methods:
    boost::math::pareto myp1(1., 1); // Using typedef
@@ -328,8 +329,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_poisson.cpp
==============================================================================
--- trunk/libs/math/test/test_poisson.cpp	(original)
+++ trunk/libs/math/test/test_poisson.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -23,7 +23,8 @@
 #  pragma warning(disable: 4127) // conditional expression is constant.
 #endif
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
@@ -491,7 +492,7 @@
 
 //
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can construct normal distribution using the two convenience methods:
   using namespace boost::math;
@@ -607,8 +608,8 @@
 #endif
 #endif
 #endif
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_policy.cpp
==============================================================================
--- trunk/libs/math/test/test_policy.cpp	(original)
+++ trunk/libs/math/test/test_policy.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +24,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -169,8 +170,8 @@
    BOOST_CHECK((is_same<policy<discrete_quantile<integer_round_up> >::promote_double_type, policy<>::promote_double_type>::value));
    BOOST_CHECK((is_same<policy<discrete_quantile<integer_round_up> >::discrete_quantile_type, discrete_quantile<integer_round_up> >::value));
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_2.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_2.cpp	(original)
+++ trunk/libs/math/test/test_policy_2.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -1,4 +1,4 @@
-
+#define BOOST_TEST_MAIN
 // Copyright John Maddock 2007.
 
 // Use, modification and distribution are subject to the
@@ -8,7 +8,7 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +23,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -40,8 +40,8 @@
    BOOST_CHECK((is_same<policy<domain_error<ignore_error>, overflow_error<ignore_error> >::promote_double_type, policy<>::promote_double_type>::value));
    BOOST_CHECK((is_same<policy<domain_error<ignore_error>, overflow_error<ignore_error> >::discrete_quantile_type, policy<>::discrete_quantile_type>::value));
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_3.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_3.cpp	(original)
+++ trunk/libs/math/test/test_policy_3.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +24,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -40,8 +41,8 @@
    BOOST_CHECK((is_same<policy<denorm_error<throw_on_error>, domain_error<ignore_error> >::promote_double_type, policy<>::promote_double_type>::value));
    BOOST_CHECK((is_same<policy<denorm_error<throw_on_error>, domain_error<ignore_error> >::discrete_quantile_type, policy<>::discrete_quantile_type>::value));
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_4.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_4.cpp	(original)
+++ trunk/libs/math/test/test_policy_4.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -1,4 +1,4 @@
-
+#define BOOST_TEST_MAIN
 // Copyright John Maddock 2007.
 
 // Use, modification and distribution are subject to the
@@ -8,7 +8,7 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +23,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -40,8 +40,8 @@
    BOOST_CHECK((is_same<policy<digits2<20>, promote_float<false>, discrete_quantile<integer_round_down>, denorm_error<throw_on_error>, domain_error<ignore_error> >::promote_double_type, policy<>::promote_double_type>::value));
    BOOST_CHECK((is_same<policy<digits2<20>, promote_float<false>, discrete_quantile<integer_round_down>, denorm_error<throw_on_error>, domain_error<ignore_error> >::discrete_quantile_type, discrete_quantile<integer_round_down> >::value));
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_5.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_5.cpp	(original)
+++ trunk/libs/math/test/test_policy_5.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +24,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -40,8 +41,8 @@
    BOOST_CHECK((is_same<normalise<policy<digits2<20>, promote_float<false>, discrete_quantile<integer_round_down>, denorm_error<throw_on_error>, domain_error<ignore_error> > >::type::promote_double_type, policy<>::promote_double_type>::value));
    BOOST_CHECK((is_same<normalise<policy<digits2<20>, promote_float<false>, discrete_quantile<integer_round_down>, denorm_error<throw_on_error>, domain_error<ignore_error> > >::type::discrete_quantile_type, discrete_quantile<integer_round_down> >::value));
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_6.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_6.cpp	(original)
+++ trunk/libs/math/test/test_policy_6.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -1,4 +1,4 @@
-
+#define BOOST_TEST_MAIN
 // Copyright John Maddock 2007.
 
 // Use, modification and distribution are subject to the
@@ -8,7 +8,7 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +23,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -40,8 +40,8 @@
    BOOST_CHECK((is_same<normalise<policy<>, digits2<20>, promote_float<false>, discrete_quantile<integer_round_down>, denorm_error<throw_on_error>, domain_error<ignore_error>  >::type::promote_double_type, policy<>::promote_double_type>::value));
    BOOST_CHECK((is_same<normalise<policy<>, digits2<20>, promote_float<false>, discrete_quantile<integer_round_down>, denorm_error<throw_on_error>, domain_error<ignore_error>  >::type::discrete_quantile_type, discrete_quantile<integer_round_down> >::value));
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_7.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_7.cpp	(original)
+++ trunk/libs/math/test/test_policy_7.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,8 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +24,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -36,8 +37,8 @@
    BOOST_CHECK(check_same(make_policy(pole_error<ignore_error>()), normalise<policy<pole_error<ignore_error> > >::type()));
    BOOST_CHECK(check_same(make_policy(indeterminate_result_error<ignore_error>()), normalise<policy<indeterminate_result_error<ignore_error> > >::type()));
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_8.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_8.cpp	(original)
+++ trunk/libs/math/test/test_policy_8.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -1,4 +1,4 @@
-
+#define BOOST_TEST_MAIN
 // Copyright John Maddock 2007.
 
 // Use, modification and distribution are subject to the
@@ -8,7 +8,7 @@
 
 #include <boost/math/policies/policy.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/test/test_exec_monitor.hpp> // for test_main
+#include <boost/test/unit_test.hpp> // for test_main
 #include <iostream>
 
 template <class P1, class P2>
@@ -23,7 +23,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    using namespace boost::math::policies;
    using namespace boost;
@@ -43,8 +43,8 @@
    BOOST_CHECK(check_same(make_policy(domain_error<ignore_error>(), pole_error<ignore_error>(), overflow_error<ignore_error>(), underflow_error<throw_on_error>(), denorm_error<throw_on_error>(), evaluation_error<ignore_error>(), indeterminate_result_error<throw_on_error>(), digits2<10>(), promote_float<false>(), promote_double<false>(), discrete_quantile<integer_round_down>()), policy<domain_error<ignore_error>, pole_error<ignore_error>, overflow_error<ignore_error>, underflow_error<throw_on_error>, denorm_error<throw_on_error>, evaluation_error<ignore_error>, indeterminate_result_error<throw_on_error>, digits2<10>, promote_float<false>, promote_double<false>, discrete_quantile<integer_round_down> >()));
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 
 
Modified: trunk/libs/math/test/test_policy_sf.cpp
==============================================================================
--- trunk/libs/math/test/test_policy_sf.cpp	(original)
+++ trunk/libs/math/test/test_policy_sf.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -3,7 +3,8 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions.hpp>
 
@@ -37,7 +38,7 @@
 #undef isfinite
 #undef isnan
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    int i;
    TEST_POLICY_SF(tgamma(3.0));
@@ -130,7 +131,7 @@
    TEST_POLICY_SF(sph_bessel(3, 5));
    TEST_POLICY_SF(sph_neumann(3, 5.0));
    TEST_POLICY_SF(sph_neumann(3, 5));
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_rational_instances/test_rational.hpp
==============================================================================
--- trunk/libs/math/test/test_rational_instances/test_rational.hpp	(original)
+++ trunk/libs/math/test/test_rational_instances/test_rational.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -8,7 +8,7 @@
 #define BOOST_MATH_TEST_RATIONAL_HPP
 
 #include <boost/test/floating_point_comparison.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/array.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/tools/precision.hpp>
Modified: trunk/libs/math/test/test_rationals.cpp
==============================================================================
--- trunk/libs/math/test/test_rationals.cpp	(original)
+++ trunk/libs/math/test/test_rationals.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,8 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/array.hpp>
 #include <boost/math/tools/rational.hpp>
@@ -26,7 +27,7 @@
    do_test_spots(t, T(0));
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    test_spots(0.0F, "float");
    test_spots(0.0, "double");
@@ -41,7 +42,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_rayleigh.cpp
==============================================================================
--- trunk/libs/math/test/test_rayleigh.cpp	(original)
+++ trunk/libs/math/test/test_rayleigh.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -16,7 +16,8 @@
 #include <boost/math/distributions/rayleigh.hpp>
     using boost::math::rayleigh_distribution;
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
@@ -213,7 +214,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can generate rayleigh distribution using the two convenience methods:
    boost::math::rayleigh ray1(1.); // Using typedef
@@ -308,8 +309,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_real_concept.cpp
==============================================================================
--- trunk/libs/math/test/test_real_concept.cpp	(original)
+++ trunk/libs/math/test/test_real_concept.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -7,14 +7,15 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/constants/constants.hpp>
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 
@@ -567,6 +568,6 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
Modified: trunk/libs/math/test/test_remez.cpp
==============================================================================
--- trunk/libs/math/test/test_remez.cpp	(original)
+++ trunk/libs/math/test/test_remez.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -14,7 +14,8 @@
 #endif
 
 #include <boost/math/tools/remez.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/expm1.hpp>
 
@@ -174,11 +175,11 @@
    std::cout << "~~~~~~~~~~~~~~~~~~~~~~~~~" << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    test_polynomial();
    test_rational();
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_roots.cpp
==============================================================================
--- trunk/libs/math/test/test_roots.cpp	(original)
+++ trunk/libs/math/test/test_roots.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 
 #include <pch.hpp>
 
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/test/results_collector.hpp>
 #include <boost/math/special_functions/beta.hpp>
@@ -314,10 +315,10 @@
    test_inverses<T>(ibeta_large_data);
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    test_beta(0.1, "double");
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_round.cpp
==============================================================================
--- trunk/libs/math/test/test_round.cpp	(original)
+++ trunk/libs/math/test/test_round.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 #include <pch.hpp>
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <boost/math/special_functions/trunc.hpp>
@@ -297,7 +298,7 @@
 #endif
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    test_round(0.1F, "float");
    test_round(0.1, "double");
@@ -310,7 +311,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_sign.cpp
==============================================================================
--- trunk/libs/math/test/test_sign.cpp	(original)
+++ trunk/libs/math/test/test_sign.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -1,4 +1,4 @@
-// Copyright John Maddock 2008
+#define BOOST_TEST_MAIN// Copyright John Maddock 2008
 //  (C) Copyright Paul A. Bristow 2011 (added tests for changesign)
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0.
@@ -8,7 +8,8 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/special_functions/sign.hpp>
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
@@ -138,7 +139,7 @@
 }
 
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    // Basic sanity-check spot values.
    // (Parameter value, arbitrarily zero, only communicates the floating point type).
@@ -156,6 +157,6 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
Modified: trunk/libs/math/test/test_skew_normal.cpp
==============================================================================
--- trunk/libs/math/test/test_skew_normal.cpp	(original)
+++ trunk/libs/math/test/test_skew_normal.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -17,7 +17,8 @@
 //#include <pch.hpp> // include directory libs/math/src/tr1/ is needed.
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/skew_normal.hpp>
@@ -447,7 +448,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 
 
@@ -496,8 +497,8 @@
     "to pass.</note>" << std::cout;
 #endif
   /*      */
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_spherical_harmonic.cpp
==============================================================================
--- trunk/libs/math/test/test_spherical_harmonic.cpp	(original)
+++ trunk/libs/math/test/test_spherical_harmonic.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 #include <pch_light.hpp>
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
@@ -285,7 +286,7 @@
    BOOST_CHECK_CLOSE_FRACTION(::boost::math::spherical_harmonic_i(53, 42, static_cast<T>(-8.75), static_cast<T>(-2.25)), static_cast<T>(0.0002099802242493057018193798824353982612756L), tolerance);
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    test_spots(0.0F, "float");
@@ -310,7 +311,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_students_t.cpp
==============================================================================
--- trunk/libs/math/test/test_students_t.cpp	(original)
+++ trunk/libs/math/test/test_students_t.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -18,7 +18,8 @@
 #  pragma warning (disable :4127) // conditional expression is constant.
 #endif
 
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
@@ -690,7 +691,7 @@
 
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can construct students_t distribution using the two convenience methods:
   using namespace boost::math;
@@ -715,8 +716,8 @@
 #endif
 
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_tgamma_ratio.cpp
==============================================================================
--- trunk/libs/math/test/test_tgamma_ratio.cpp	(original)
+++ trunk/libs/math/test/test_tgamma_ratio.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -117,7 +117,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    BOOST_MATH_CONTROL_FP;
    expected_results();
@@ -139,7 +139,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_tgamma_ratio.hpp
==============================================================================
--- trunk/libs/math/test/test_tgamma_ratio.hpp	(original)
+++ trunk/libs/math/test/test_tgamma_ratio.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -7,7 +7,8 @@
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 
 #include <boost/math/concepts/real_concept.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/tools/stats.hpp>
Modified: trunk/libs/math/test/test_toms748_solve.cpp
==============================================================================
--- trunk/libs/math/test/test_toms748_solve.cpp	(original)
+++ trunk/libs/math/test/test_toms748_solve.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,8 @@
 
 #include <pch.hpp>
 
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/tools/toms748_solve.hpp>
@@ -161,7 +162,7 @@
    toms748tester<double>::reset();
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    std::cout << std::setprecision(18);
    run_test(3.14/2, 3.14, 1);
@@ -266,7 +267,5 @@
       toms748tester<double>::reset();
       BOOST_CHECK(c < 20);
    }
-
-   return 0;
 }
 
Modified: trunk/libs/math/test/test_tr1.cpp
==============================================================================
--- trunk/libs/math/test/test_tr1.cpp	(original)
+++ trunk/libs/math/test/test_tr1.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -3,7 +3,8 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <math.h>  // ldexpf
@@ -1609,7 +1610,7 @@
 #endif
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 #ifndef TEST_LD
    test_values(1.0f, "float");
@@ -1619,6 +1620,6 @@
    test_values(1.0L, "long double");
 #endif
 #endif
-   return 0;
+   
 }
 
Modified: trunk/libs/math/test/test_triangular.cpp
==============================================================================
--- trunk/libs/math/test/test_triangular.cpp	(original)
+++ trunk/libs/math/test/test_triangular.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -16,7 +16,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/triangular.hpp>
@@ -528,7 +529,7 @@
   check_out_of_range<triangular_distribution<RealType> >(-1, 0, 1);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   //  double toleps = std::numeric_limits<double>::epsilon(); // 5 eps as a fraction.
   double tol5eps = std::numeric_limits<double>::epsilon() * 5; // 5 eps as a fraction.
@@ -680,8 +681,8 @@
         "to pass.</note>" << std::cout;
   #endif
 
-  return 0;
-} // int test_main(int, char* [])
+  
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_uniform.cpp
==============================================================================
--- trunk/libs/math/test/test_uniform.cpp	(original)
+++ trunk/libs/math/test/test_uniform.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -16,7 +16,8 @@
 #endif
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/uniform.hpp>
@@ -371,7 +372,7 @@
    check_out_of_range<uniform_distribution<RealType> >(1, 5);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
   // Check that can construct uniform distribution using the two convenience methods:
   using namespace boost::math;
@@ -429,8 +430,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_weibull.cpp
==============================================================================
--- trunk/libs/math/test/test_weibull.cpp	(original)
+++ trunk/libs/math/test/test_weibull.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -14,7 +14,8 @@
 
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
-#include <boost/test/test_exec_monitor.hpp> // Boost.Test
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/weibull.hpp>
@@ -346,7 +347,7 @@
    check_out_of_range<weibull_distribution<RealType> >(1, 1);
 } // template <class RealType>void test_spots(RealType)
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
 
   // Check that can construct weibull distribution using the two convenience methods:
@@ -370,8 +371,8 @@
       "to pass.</note>" << std::cout;
 #endif
 
-   return 0;
-} // int test_main(int, char* [])
+   
+} // BOOST_AUTO_TEST_CASE( test_main )
 
 /*
 
Modified: trunk/libs/math/test/test_zeta.cpp
==============================================================================
--- trunk/libs/math/test/test_zeta.cpp	(original)
+++ trunk/libs/math/test/test_zeta.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -81,7 +81,7 @@
       << BOOST_STDLIB << ", " << BOOST_PLATFORM << std::endl;
 }
 
-int test_main(int, char* [])
+BOOST_AUTO_TEST_CASE( test_main )
 {
    expected_results();
    BOOST_MATH_CONTROL_FP;
@@ -109,7 +109,7 @@
       "not available at all, or because they are too inaccurate for these tests "
       "to pass.</note>" << std::cout;
 #endif
-   return 0;
+   
 }
 
 
Modified: trunk/libs/math/test/test_zeta.hpp
==============================================================================
--- trunk/libs/math/test/test_zeta.hpp	(original)
+++ trunk/libs/math/test/test_zeta.hpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,8 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
-#include <boost/test/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
Modified: trunk/libs/math/tools/carlson_ellint_data.cpp
==============================================================================
--- trunk/libs/math/tools/carlson_ellint_data.cpp	(original)
+++ trunk/libs/math/tools/carlson_ellint_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -7,7 +7,7 @@
 #include <boost/math/bindings/rr.hpp>
 //#include <boost/math/tools/dual_precision.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/ellint_3.hpp>
 #include <fstream>
 #include <boost/math/tools/test_data.hpp>
@@ -100,7 +100,7 @@
    return boost::math::make_tuple(xr, yr, zr, result);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/digamma_data.cpp
==============================================================================
--- trunk/libs/math/tools/digamma_data.cpp	(original)
+++ trunk/libs/math/tools/digamma_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/special_functions/digamma.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <fstream>
 
 #include <boost/math/tools/test_data.hpp>
@@ -26,7 +26,7 @@
    return force_truncate(&f);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(40);
Modified: trunk/libs/math/tools/ellint_e_data.cpp
==============================================================================
--- trunk/libs/math/tools/ellint_e_data.cpp	(original)
+++ trunk/libs/math/tools/ellint_e_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/ellint_2.hpp>
 #include <fstream>
 #include <boost/math/tools/test_data.hpp>
@@ -21,7 +21,7 @@
    return ellint_2(k);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/ellint_f_data.cpp
==============================================================================
--- trunk/libs/math/tools/ellint_f_data.cpp	(original)
+++ trunk/libs/math/tools/ellint_f_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/ellint_1.hpp>
 #include <fstream>
 #include <boost/math/tools/test_data.hpp>
@@ -31,7 +31,7 @@
    return ellint_1(k, phi);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/ellint_k_data.cpp
==============================================================================
--- trunk/libs/math/tools/ellint_k_data.cpp	(original)
+++ trunk/libs/math/tools/ellint_k_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/ellint_1.hpp>
 #include <fstream>
 #include <boost/math/tools/test_data.hpp>
@@ -21,7 +21,7 @@
    return ellint_1(k);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/ellint_pi2_data.cpp
==============================================================================
--- trunk/libs/math/tools/ellint_pi2_data.cpp	(original)
+++ trunk/libs/math/tools/ellint_pi2_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,7 @@
 #include <boost/math/bindings/rr.hpp>
 //#include <boost/math/tools/dual_precision.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/ellint_2.hpp>
 #include <boost/math/special_functions/ellint_3.hpp>
 #include <fstream>
@@ -17,7 +17,7 @@
 using namespace boost::math;
 using namespace std;
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/ellint_pi3_data.cpp
==============================================================================
--- trunk/libs/math/tools/ellint_pi3_data.cpp	(original)
+++ trunk/libs/math/tools/ellint_pi3_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -9,7 +9,7 @@
 #include <boost/math/bindings/rr.hpp>
 //#include <boost/math/tools/dual_precision.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/ellint_3.hpp>
 #include <fstream>
 #include <boost/math/tools/test_data.hpp>
@@ -33,7 +33,7 @@
    return boost::math::make_tuple(kr, result);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/erf_data.cpp
==============================================================================
--- trunk/libs/math/tools/erf_data.cpp	(original)
+++ trunk/libs/math/tools/erf_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/erf.hpp> // for inverses
 #include <boost/math/constants/constants.hpp>
@@ -128,7 +128,7 @@
 }
 
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(40);
Modified: trunk/libs/math/tools/gamma_P_inva_data.cpp
==============================================================================
--- trunk/libs/math/tools/gamma_P_inva_data.cpp	(original)
+++ trunk/libs/math/tools/gamma_P_inva_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/test.hpp>
@@ -46,7 +46,7 @@
 };
 
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(100);
Modified: trunk/libs/math/tools/hermite_data.cpp
==============================================================================
--- trunk/libs/math/tools/hermite_data.cpp	(original)
+++ trunk/libs/math/tools/hermite_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/hermite.hpp>
 #include <fstream>
 #include <boost/math/tools/test_data.hpp>
@@ -24,7 +24,7 @@
    return boost::math::make_tuple(n, x, r1);
 }
    
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/hypergeometric_dist_data.cpp
==============================================================================
--- trunk/libs/math/tools/hypergeometric_dist_data.cpp	(original)
+++ trunk/libs/math/tools/hypergeometric_dist_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -6,7 +6,7 @@
 //#define BOOST_MATH_INSTRUMENT
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/distributions/hypergeometric.hpp>
 #include <boost/math/special_functions/trunc.hpp>
 #include <boost/math/constants/constants.hpp>
@@ -69,7 +69,7 @@
    }
 };
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(100);
Modified: trunk/libs/math/tools/ibeta_data.cpp
==============================================================================
--- trunk/libs/math/tools/ibeta_data.cpp	(original)
+++ trunk/libs/math/tools/ibeta_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/constants/constants.hpp>
@@ -239,7 +239,7 @@
    }
 };
 
-int test_main(int, char* [])
+int cpp_main(int, char* [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(40);
Modified: trunk/libs/math/tools/ibeta_inv_data.cpp
==============================================================================
--- trunk/libs/math/tools/ibeta_inv_data.cpp	(original)
+++ trunk/libs/math/tools/ibeta_inv_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #if 1
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/test.hpp>
@@ -57,7 +57,7 @@
    }
 };
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(100);
Modified: trunk/libs/math/tools/ibeta_invab_data.cpp
==============================================================================
--- trunk/libs/math/tools/ibeta_invab_data.cpp	(original)
+++ trunk/libs/math/tools/ibeta_invab_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/test.hpp>
@@ -61,7 +61,7 @@
    }
 };
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(100);
Modified: trunk/libs/math/tools/igamma_data.cpp
==============================================================================
--- trunk/libs/math/tools/igamma_data.cpp	(original)
+++ trunk/libs/math/tools/igamma_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/test.hpp>
@@ -106,7 +106,7 @@
 };
 
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(100);
Modified: trunk/libs/math/tools/inv_hyp_data.cpp
==============================================================================
--- trunk/libs/math/tools/inv_hyp_data.cpp	(original)
+++ trunk/libs/math/tools/inv_hyp_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/test.hpp>
 #include <fstream>
@@ -47,7 +47,7 @@
    }
 };
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(500);
    boost::math::ntl::RR::SetOutputPrecision(40);
Modified: trunk/libs/math/tools/laguerre_data.cpp
==============================================================================
--- trunk/libs/math/tools/laguerre_data.cpp	(original)
+++ trunk/libs/math/tools/laguerre_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/laguerre.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <fstream>
@@ -34,7 +34,7 @@
    return boost::math::make_tuple(n, m, x, r1);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/lanczos_generator.cpp
==============================================================================
--- trunk/libs/math/tools/lanczos_generator.cpp	(original)
+++ trunk/libs/math/tools/lanczos_generator.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -16,7 +16,7 @@
 #include <boost/math/special_functions/log1p.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/array.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 
 //
 // this is a sort of recursive include, since this file
@@ -4278,7 +4278,7 @@
 
    print_code(best, name);
 }
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    bool test_double(false), test_long(false), test_float(false), test_quad(false), spots(false), test_data(false);
 
Modified: trunk/libs/math/tools/legendre_data.cpp
==============================================================================
--- trunk/libs/math/tools/legendre_data.cpp	(original)
+++ trunk/libs/math/tools/legendre_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/legendre.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <fstream>
@@ -37,7 +37,7 @@
    return boost::math::make_tuple(n, m, x, r1);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/spherical_harmonic_data.cpp
==============================================================================
--- trunk/libs/math/tools/spherical_harmonic_data.cpp	(original)
+++ trunk/libs/math/tools/spherical_harmonic_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -5,7 +5,7 @@
 
 #include <boost/math/bindings/rr.hpp>
 #include <boost/math/tools/test_data.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/spherical_harmonic.hpp>
 #include <fstream>
 #include <boost/math/tools/test_data.hpp>
@@ -45,7 +45,7 @@
    return boost::math::make_tuple(n, m, theta, phi, r1, r2);
 }
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    using namespace boost::math::tools;
 
Modified: trunk/libs/math/tools/tgamma_ratio_data.cpp
==============================================================================
--- trunk/libs/math/tools/tgamma_ratio_data.cpp	(original)
+++ trunk/libs/math/tools/tgamma_ratio_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/tools/test.hpp>
 #include <fstream>
@@ -34,7 +34,7 @@
 }
 
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(1000);
    boost::math::ntl::RR::SetOutputPrecision(40);
Modified: trunk/libs/math/tools/zeta_data.cpp
==============================================================================
--- trunk/libs/math/tools/zeta_data.cpp	(original)
+++ trunk/libs/math/tools/zeta_data.cpp	2013-02-08 00:09:47 EST (Fri, 08 Feb 2013)
@@ -4,7 +4,7 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/math/bindings/rr.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/test/included/prg_exec_monitor.hpp>
 #include <boost/math/special_functions/zeta.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/test.hpp>
@@ -38,7 +38,7 @@
 };
 
 
-int test_main(int argc, char*argv [])
+int cpp_main(int argc, char*argv [])
 {
    boost::math::ntl::RR::SetPrecision(500);
    boost::math::ntl::RR::SetOutputPrecision(40);