diff --git a/test/Jamfile b/test/Jamfile index 4b47929..80da6d4 100755 --- a/test/Jamfile +++ b/test/Jamfile @@ -33,19 +33,19 @@ test-suite multi_array [ compile-fail fail_ref_cview2.cpp ] [ compile-fail fail_ref_cview3.cpp ] - [ run constructors.cpp ../../test/build/boost_test_exec_monitor ] - [ run access.cpp ../../test/build/boost_test_exec_monitor ] - [ run compare.cpp ../../test/build/boost_test_exec_monitor ] - [ run iterators.cpp ../../test/build/boost_test_exec_monitor ] - [ run slice.cpp ../../test/build/boost_test_exec_monitor ] - [ run assign.cpp ../../test/build/boost_test_exec_monitor ] - [ run assign_to_array.cpp ../../test/build/boost_test_exec_monitor ] - [ run index_bases.cpp ../../test/build/boost_test_exec_monitor ] - [ run storage_order.cpp ../../test/build/boost_test_exec_monitor ] - [ run reshape.cpp ../../test/build/boost_test_exec_monitor ] - [ run range1.cpp ../../test/build/boost_test_exec_monitor ] - [ run idxgen1.cpp ../../test/build/boost_test_exec_monitor ] - [ run stl_interaction.cpp ../../test/build/boost_test_exec_monitor ] - [ run resize.cpp ../../test/build/boost_test_exec_monitor ] + [ run constructors.cpp ] + [ run access.cpp ] + [ run compare.cpp ] + [ run iterators.cpp ] + [ run slice.cpp ] + [ run assign.cpp ] + [ run assign_to_array.cpp ] + [ run index_bases.cpp ] + [ run storage_order.cpp ] + [ run reshape.cpp ] + [ run range1.cpp ] + [ run idxgen1.cpp ] + [ run stl_interaction.cpp ] + [ run resize.cpp ] [ compile concept_checks.cpp ] ; diff --git a/test/compare.cpp b/test/compare.cpp index 12f3480..26fcdee 100644 --- a/test/compare.cpp +++ b/test/compare.cpp @@ -14,8 +14,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include #include diff --git a/test/constructors.cpp b/test/constructors.cpp index bc327d9..65bf80f 100644 --- a/test/constructors.cpp +++ b/test/constructors.cpp @@ -15,8 +15,7 @@ // -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/multi_array.hpp" #include diff --git a/test/fail_cbracket.cpp b/test/fail_cbracket.cpp index ef71ee5..45b661f 100644 --- a/test/fail_cbracket.cpp +++ b/test/fail_cbracket.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_cdata.cpp b/test/fail_cdata.cpp index c1a973a..b7dd077 100644 --- a/test/fail_cdata.cpp +++ b/test/fail_cdata.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_citerator.cpp b/test/fail_citerator.cpp index fb8f892..42601c3 100644 --- a/test/fail_citerator.cpp +++ b/test/fail_citerator.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" int test_main(int,char*[]) { diff --git a/test/fail_cparen.cpp b/test/fail_cparen.cpp index da6d359..ff6ae1e 100644 --- a/test/fail_cparen.cpp +++ b/test/fail_cparen.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_criterator.cpp b/test/fail_criterator.cpp index db3c5a4..648a8c1 100644 --- a/test/fail_criterator.cpp +++ b/test/fail_criterator.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" int test_main(int,char*[]) { diff --git a/test/fail_csubarray.cpp b/test/fail_csubarray.cpp index da256f7..a7950e2 100644 --- a/test/fail_csubarray.cpp +++ b/test/fail_csubarray.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_csubarray2.cpp b/test/fail_csubarray2.cpp index 53c70d3..83a576b 100644 --- a/test/fail_csubarray2.cpp +++ b/test/fail_csubarray2.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_csubarray3.cpp b/test/fail_csubarray3.cpp index c48ed56..225da46 100644 --- a/test/fail_csubarray3.cpp +++ b/test/fail_csubarray3.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_cview.cpp b/test/fail_cview.cpp index d371cb4..15e3bcb 100644 --- a/test/fail_cview.cpp +++ b/test/fail_cview.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include "boost/type.hpp" diff --git a/test/fail_cview3.cpp b/test/fail_cview3.cpp index 51bb022..7aea023 100644 --- a/test/fail_cview3.cpp +++ b/test/fail_cview3.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include "boost/type.hpp" diff --git a/test/fail_ref_cbracket.cpp b/test/fail_ref_cbracket.cpp index 4288978..f715517 100644 --- a/test/fail_ref_cbracket.cpp +++ b/test/fail_ref_cbracket.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_ref_cdata.cpp b/test/fail_ref_cdata.cpp index 587d752..91d93ec 100644 --- a/test/fail_ref_cdata.cpp +++ b/test/fail_ref_cdata.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_ref_citerator.cpp b/test/fail_ref_citerator.cpp index d572ca9..601ef35 100644 --- a/test/fail_ref_citerator.cpp +++ b/test/fail_ref_citerator.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" int test_main(int,char*[]) { diff --git a/test/fail_ref_cparen.cpp b/test/fail_ref_cparen.cpp index 1dca1dd..a279f33 100644 --- a/test/fail_ref_cparen.cpp +++ b/test/fail_ref_cparen.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_ref_criterator.cpp b/test/fail_ref_criterator.cpp index 250e625..a273e3d 100644 --- a/test/fail_ref_criterator.cpp +++ b/test/fail_ref_criterator.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" int test_main(int,char*[]) { diff --git a/test/fail_ref_csubarray.cpp b/test/fail_ref_csubarray.cpp index 66a46ea..1634bfe 100644 --- a/test/fail_ref_csubarray.cpp +++ b/test/fail_ref_csubarray.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_ref_csubarray2.cpp b/test/fail_ref_csubarray2.cpp index 0e8292e..e98a632 100644 --- a/test/fail_ref_csubarray2.cpp +++ b/test/fail_ref_csubarray2.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_ref_csubarray3.cpp b/test/fail_ref_csubarray3.cpp index df161fa..79579c7 100644 --- a/test/fail_ref_csubarray3.cpp +++ b/test/fail_ref_csubarray3.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/fail_ref_cview.cpp b/test/fail_ref_cview.cpp index 4b6c889..d1fea5d 100644 --- a/test/fail_ref_cview.cpp +++ b/test/fail_ref_cview.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include "boost/type.hpp" diff --git a/test/fail_ref_cview2.cpp b/test/fail_ref_cview2.cpp index 8b0959a..a85152b 100644 --- a/test/fail_ref_cview2.cpp +++ b/test/fail_ref_cview2.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include "boost/type.hpp" diff --git a/test/fail_ref_cview3.cpp b/test/fail_ref_cview3.cpp index d594a19..13a8f48 100644 --- a/test/fail_ref_cview3.cpp +++ b/test/fail_ref_cview3.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include "boost/type.hpp" diff --git a/test/generative_tests.hpp b/test/generative_tests.hpp index 600ae45..d1f5286 100644 --- a/test/generative_tests.hpp +++ b/test/generative_tests.hpp @@ -35,8 +35,7 @@ // #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include #include diff --git a/test/idxgen1.cpp b/test/idxgen1.cpp index 283c9ef..8f1b86f 100644 --- a/test/idxgen1.cpp +++ b/test/idxgen1.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array/index_gen.hpp" #include "boost/multi_array/index_range.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include diff --git a/test/index_bases.cpp b/test/index_bases.cpp index 839df4d..41841f4 100644 --- a/test/index_bases.cpp +++ b/test/index_bases.cpp @@ -16,8 +16,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include diff --git a/test/range1.cpp b/test/range1.cpp index f56d186..00a204e 100644 --- a/test/range1.cpp +++ b/test/range1.cpp @@ -17,8 +17,7 @@ #include "boost/multi_array/index_range.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include diff --git a/test/reshape.cpp b/test/reshape.cpp index ddcf411..9de2b43 100644 --- a/test/reshape.cpp +++ b/test/reshape.cpp @@ -16,8 +16,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include "boost/type.hpp" diff --git a/test/resize.cpp b/test/resize.cpp index c594647..f566c82 100644 --- a/test/resize.cpp +++ b/test/resize.cpp @@ -14,7 +14,7 @@ // resize.cpp - Test of resizing multi_arrays // -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/multi_array.hpp" #include using namespace std; diff --git a/test/stl_interaction.cpp b/test/stl_interaction.cpp index c881e30..3c6a12a 100644 --- a/test/stl_interaction.cpp +++ b/test/stl_interaction.cpp @@ -14,8 +14,7 @@ // stl_interaction.cpp - Make sure multi_arrays work with STL containers. // -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/multi_array.hpp" #include diff --git a/test/storage_order.cpp b/test/storage_order.cpp index 54560fe..e632ecc 100644 --- a/test/storage_order.cpp +++ b/test/storage_order.cpp @@ -16,8 +16,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" diff --git a/test/storage_order_convert.cpp b/test/storage_order_convert.cpp index 289c4af..6dc7a81 100644 --- a/test/storage_order_convert.cpp +++ b/test/storage_order_convert.cpp @@ -14,8 +14,7 @@ // test out my new storage_order stuff // -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/multi_array/storage_order.hpp" diff --git a/test/vc_death.cpp b/test/vc_death.cpp index 4702c01..8e1dc9d 100644 --- a/test/vc_death.cpp +++ b/test/vc_death.cpp @@ -16,8 +16,7 @@ #include "boost/multi_array.hpp" -#define BOOST_INCLUDE_MAIN -#include "boost/test/test_tools.hpp" +#include "boost/test/minimal.hpp" #include "boost/array.hpp" #include