Updated tests and jamfiles to reflect the changed testing headers location.

core/test/Jamfile.v2

@@ -11,6 +11,11 @@
 
 import testing ;
 
+project
+    : requirements
+        <include>.
+    ;
+
 compile aux_/largest_int.cpp ;
 
 compile arithmetic.cpp ;

core/test/arithmetic.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/arithmetic.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

core/test/aux_/largest_int.cpp

@@ -12,9 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/aux_/largest_int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
-
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

core/test/bitwise.cpp

@@ -14,7 +14,7 @@
 
 #include <boost/mpl/bitwise.hpp>
 #include <boost/mpl/integral_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 typedef integral_c<unsigned int, 0> _0;
 typedef integral_c<unsigned int, 1> _1;

core/test/bool.cpp

@@ -12,8 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 #include <cassert>
 

core/test/comparison.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/comparison.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 // make sure MSVC behaves nicely in presence of the following template
 template< typename T > struct value {};

core/test/eval_if.cpp

@@ -14,10 +14,8 @@
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/identity.hpp>
-
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

core/test/has_xxx.cpp

@@ -14,7 +14,7 @@
 
 #include <boost/mpl/has_xxx.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 BOOST_MPL_HAS_XXX_TRAIT_DEF(xxx)
 BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF(has_xxx_template, xxx, false)

core/test/identity.cpp

@@ -13,8 +13,8 @@
 
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

core/test/if.cpp

@@ -13,8 +13,8 @@
 
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

core/test/integral_wrapper_test.hpp

@@ -12,9 +12,9 @@
 // $Revision$
 
 #include <boost/mpl/next_prior.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 #include <cassert>
 

core/test/logical.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/logical.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 struct unknown;
 

core/test/min_max.cpp

@@ -13,10 +13,8 @@
 
 #include <boost/mpl/min_max.hpp>
 #include <boost/mpl/int.hpp>
-
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
-
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

core/test/numeric_ops.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/long.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 struct complex_tag : int_<10> {};
 

core/test/print.cpp

@@ -12,9 +12,7 @@
 // $Revision$
 
 #include <boost/mpl/print.hpp>
-
+#include "test.hpp"
-#include <boost/mpl/aux_/test.hpp>
-
 
 MPL_TEST_CASE()
 {

core/test/sizeof.cpp

@@ -12,7 +12,7 @@
 // $Revision$
 
 #include <boost/mpl/sizeof.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 struct my
 {

core/test/test.hpp

@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -14,9 +14,9 @@
 // $Date$
 // $Revision$
 
-#include <boost/mpl/aux_/test/test_case.hpp>
+#include "test/test_case.hpp"
-#include <boost/mpl/aux_/test/data.hpp>
+#include "test/data.hpp"
-#include <boost/mpl/aux_/test/assert.hpp>
+#include "test/assert.hpp"
 #include <boost/core/lightweight_test.hpp>
 
 int main()
@@ -27,4 +27,4 @@ int main()
 using namespace boost;
 using namespace mpl;
 
-#endif // BOOST_MPL_AUX_TEST_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_HPP_INCLUDED

core/test/test/assert.hpp

@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_ASSERT_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_ASSERT_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_ASSERT_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_ASSERT_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -26,4 +26,4 @@
     enum { BOOST_PP_CAT(instantiation_test, __LINE__) = sizeof( x ) } \
 /**/
 
-#endif // BOOST_MPL_AUX_TEST_ASSERT_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_ASSERT_HPP_INCLUDED

core/test/test/data.hpp

@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_DATA_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_DATA_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_DATA_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_DATA_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -22,4 +22,4 @@ struct incomplete;
 class abstract { public: virtual ~abstract() = 0; };
 using boost::noncopyable;
 
-#endif // BOOST_MPL_AUX_TEST_DATA_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_DATA_HPP_INCLUDED

core/test/test/test_case.hpp

@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_TEST_CASE_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_TEST_CASE_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_TEST_CASE_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_TEST_CASE_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -18,4 +18,4 @@
 
 #define MPL_TEST_CASE() void BOOST_PP_CAT(test,__LINE__)()
 
-#endif // BOOST_MPL_AUX_TEST_TEST_CASE_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_TEST_CASE_HPP_INCLUDED

test/Jamfile.v2

@@ -11,6 +11,11 @@
 
 import testing ;
 
+project
+    : requirements
+        <include>../core/test
+    ;
+
 compile aux_/msvc_is_class.cpp ;
 compile aux_/template_arity.cpp ;
 compile aux_/preprocessor/is_seq.cpp ;

test/advance.cpp

@@ -13,10 +13,10 @@
 
 #include <boost/mpl/advance.hpp>
 #include <boost/mpl/iterator_tags.hpp>
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 template< int pos > struct iter
 {
     typedef mpl::bidirectional_iterator_tag category;

test/always.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/int.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/apply.cpp

@@ -15,9 +15,9 @@
 #include <boost/mpl/lambda.hpp>
 #include <boost/mpl/plus.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 template< typename T > struct std_vector

test/apply_wrap.cpp

@@ -15,7 +15,6 @@
 #include <boost/mpl/limits/arity.hpp>
 #include <boost/mpl/aux_/preprocessor/params.hpp>
 #include <boost/mpl/aux_/preprocessor/enum.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/preprocessor/repeat.hpp>
@@ -24,6 +23,8 @@
 #include <boost/preprocessor/if.hpp>
 #include <boost/preprocessor/cat.hpp>
 
+#include "test.hpp"
+
 #if !defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 #   define APPLY_0_FUNC_DEF(i) \
     struct f0 \

test/as_sequence.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/as_sequence.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/at.cpp

@@ -13,8 +13,8 @@
 
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/vector/vector10_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 template< typename Seq, int n > struct at_test
 {

test/aux_/msvc_is_class.cpp

@@ -17,7 +17,7 @@
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
 
 #include <boost/mpl/aux_/msvc_is_class.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename T > struct A { T x[0]; };
 

test/aux_/template_arity.cpp

@@ -12,7 +12,7 @@
 // $Revision$
 
 #include <boost/mpl/aux_/template_arity.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 #if defined(BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING)
 

test/back.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/back.hpp>
 #include <boost/mpl/range_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename Seq, int value > struct back_test
 {

test/bind.cpp

@@ -18,11 +18,12 @@
 #include <boost/mpl/next.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/apply_wrap.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 namespace {
 
 struct f1

test/contains.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/contains.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/copy.cpp

@@ -34,7 +34,7 @@
 #include <boost/mpl/pop_back_fwd.hpp>
 #include <boost/mpl/back_fwd.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/copy_if.cpp

@@ -22,7 +22,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/type_traits/is_float.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/count.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/integral_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/count_if.cpp

@@ -16,11 +16,12 @@
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/comparison.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 MPL_TEST_CASE()
 {
     typedef vector<int,char&,long,short,char&,long,double,long> types;

test/deque.cpp

@@ -21,9 +21,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/empty.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/distance.cpp

@@ -15,7 +15,7 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/range_c.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()

test/empty.cpp

@@ -14,7 +14,7 @@
 #include <boost/mpl/empty.hpp>
 
 #include <boost/mpl/list/list10.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/empty_sequence.cpp

@@ -17,10 +17,10 @@
 #include <boost/mpl/distance.hpp>
 #include <boost/mpl/advance.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/add_pointer.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/equal.cpp

@@ -14,7 +14,7 @@
 #include <boost/mpl/equal.hpp>
 
 #include <boost/mpl/list.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/erase.cpp

@@ -18,9 +18,9 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/integral_c.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/erase_range.cpp

@@ -16,8 +16,8 @@
 #include <boost/mpl/find.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/filter_view.cpp

@@ -18,10 +18,10 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/sizeof.hpp>
 #include <boost/mpl/deref.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/find.cpp

@@ -17,8 +17,8 @@
 #include <boost/mpl/distance.hpp>
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/find_if.cpp

@@ -16,11 +16,12 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/distance.hpp>
 #include <boost/mpl/size.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 typedef vector<int,char,long,short,char,long,double,float,char>::type types;
 typedef begin<types>::type first_;
 

test/fold.cpp

@@ -27,7 +27,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/type_traits/is_float.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/front.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/range_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename Seq, int value > struct front_test
 {

test/index_of.cpp

@@ -15,7 +15,7 @@
 #include <boost/mpl/index_of.hpp>
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/void.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/inherit.cpp

@@ -12,8 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/inherit.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 struct her { typedef her herself; };
 struct my { typedef my myself; };

test/insert.cpp

@@ -18,7 +18,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/equal.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/insert_range.cpp

@@ -19,7 +19,7 @@
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/equal.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/is_placeholder.cpp

@@ -13,12 +13,12 @@
 
 #include <boost/mpl/is_placeholder.hpp>
 #include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/cat.hpp>
 
+#include "test.hpp"
+
 #define AUX_IS_PLACEHOLDER_TEST(unused1, n, unused2) \
     { MPL_ASSERT(( is_placeholder< \
           BOOST_PP_CAT(_,BOOST_PP_INC(n)) \

test/is_sequence.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/range_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename T > struct std_vector
 {

test/iterator_tags.cpp

@@ -14,7 +14,7 @@
 #include <boost/mpl/iterator_tags.hpp>
 
 #include <boost/mpl/less.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/joint_view.cpp

@@ -17,10 +17,9 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/size.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
-
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/lambda.cpp

@@ -20,10 +20,9 @@
 #include <boost/mpl/sizeof.hpp>
 #include <boost/mpl/apply.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_float.hpp>
+#include "test.hpp"
 
 struct my
 {

test/lambda_args.cpp

@@ -13,11 +13,11 @@
 
 #include <boost/mpl/lambda.hpp>
 #include <boost/mpl/apply.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 typedef int UDT::* mem_ptr;
 typedef int (UDT::* mem_fun_ptr)();

test/list.cpp

@@ -18,9 +18,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/empty.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()

test/list_c.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/static_assert.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 #include <boost/type_traits/is_same.hpp>
 

test/lower_bound.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/list_c.hpp>
 #include <boost/mpl/less.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/map.cpp

@@ -26,7 +26,7 @@
 #include <boost/mpl/begin_end.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()

test/max_element.cpp

@@ -14,7 +14,7 @@
 #include <boost/mpl/max_element.hpp>
 
 #include <boost/mpl/list_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/multiset.cpp

@@ -16,7 +16,6 @@
 
 #include <boost/mpl/insert.hpp>
 #include <boost/mpl/count.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/size.hpp>
@@ -24,6 +23,7 @@
 
 #include <boost/config.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 /*
 struct test_data1

test/next.cpp

@@ -14,8 +14,8 @@
 #include <boost/mpl/next.hpp>
 #include <boost/mpl/prior.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/pair_view.cpp

@@ -16,8 +16,8 @@
 #include <boost/mpl/vector/vector50_c.hpp>
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/distance.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()

test/partition.cpp

@@ -19,7 +19,8 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/modulus.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+
+#include "test.hpp"
 
 template< typename N > struct is_odd
     : modulus< N, int_<2> > 

test/pop_front.cpp

@@ -15,8 +15,8 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/front.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/push_back.cpp

@@ -13,9 +13,8 @@
 
 #include <boost/mpl/push_back.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 struct no_push_back_tag {};
 

test/push_front.cpp

@@ -18,10 +18,10 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/front.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 struct no_push_front_tag {};
 
 struct no_push_front

test/quote.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/mpl/quote.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename T > struct f1
 {

test/range_c.cpp

@@ -18,8 +18,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/back.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/remove.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/vector/vector10.hpp>
 #include <boost/mpl/equal.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()

test/remove_if.cpp

@@ -23,7 +23,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/type_traits/is_float.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/replace.cpp

@@ -16,7 +16,7 @@
 
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/equal.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/replace_if.cpp

@@ -21,7 +21,7 @@
 #include <boost/mpl/greater.hpp>
 #include <boost/mpl/equal_to.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/reverse.cpp

@@ -19,7 +19,7 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/at.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/same_as.cpp

@@ -12,9 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/same_as.hpp>
-
 #include <boost/mpl/apply.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/set.cpp

@@ -29,10 +29,10 @@
 #include <boost/mpl/empty.hpp>
 #include <boost/mpl/begin_end.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 // Use templates for testing so that GCC will show us the actual types involved
 
 template< typename s >

test/set_c.cpp

@@ -16,9 +16,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 namespace test { namespace {
 #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)

test/single_view.cpp

@@ -15,8 +15,8 @@
 #include <boost/mpl/advance.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/size.cpp

@@ -14,7 +14,7 @@
 #include <boost/mpl/size.hpp>
 
 #include <boost/mpl/list.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/sort.cpp

@@ -14,7 +14,7 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/equal_to.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/stable_partition.cpp

@@ -18,7 +18,7 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/comparison.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 typedef vector_c<int,3,4,0,-5,8,-1,7>::type numbers;
 typedef vector_c<int,0,-5,-1>::type manual_first;

test/transform.cpp

@@ -19,13 +19,13 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/plus.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/add_pointer.hpp>
 
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/transform_view.cpp

@@ -16,7 +16,7 @@
 #include <boost/mpl/max_element.hpp>
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/sizeof.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()

test/unique.cpp

@@ -17,7 +17,7 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/unpack_args.cpp

@@ -14,9 +14,10 @@
 #include <boost/mpl/unpack_args.hpp>
 
 #include <boost/mpl/vector/vector10.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 MPL_TEST_CASE()
 {
     MPL_ASSERT(( apply1< 

test/upper_bound.cpp

@@ -17,7 +17,7 @@
 #include <boost/mpl/list_c.hpp>
 #include <boost/mpl/less.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {

test/vector.cpp

@@ -23,10 +23,10 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/empty.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 
 MPL_TEST_CASE()
 {

test/vector_c.cpp

@@ -15,10 +15,10 @@
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/size.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 #if !BOOST_WORKAROUND(BOOST_MSVC, <=1200)
 MPL_TEST_CASE()
 {

test/zip_view.cpp

@@ -23,9 +23,8 @@
 #include <boost/mpl/unpack_args.hpp>
 #include <boost/mpl/math/is_even.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()