Subject: [Boost-commit] svn:boost r83154 - in branches/release: . boost boost/algorithm boost/algorithm/cxx11 boost/algorithm/searching boost/algorithm/searching/detail boost/algorithm/string boost/algorithm/string/detail boost/archive boost/atomic boost/bimap boost/chrono/detail boost/chrono/io boost/chrono/io_v1 boost/container boost/date_time boost/detail boost/dynamic_bitset boost/filesystem boost/function boost/functional boost/functional/overloaded_function boost/fusion boost/geometry boost/geometry/algorithms boost/geometry/arithmetic boost/geometry/core boost/geometry/domains boost/geometry/geometries boost/geometry/io boost/geometry/io/dsv boost/geometry/iterators boost/geometry/multi boost/geometry/policies boost/geometry/strategies boost/geometry/util boost/geometry/views boost/gil boost/graph boost/graph/detail boost/graph/distributed boost/graph/property_maps boost/heap boost/icl boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/iterator boost/lambda boost/local_function boost/locale boost/lockfree boost/math boost/move boost/msm boost/msm/back boost/msm/front boost/msm/front/detail boost/msm/front/euml boost/msm/mpl_graph boost/multi_index boost/multiprecision boost/numeric boost/numeric/odeint boost/numeric/ublas boost/parameter boost/pending boost/pool boost/preprocessor boost/program_options boost/property_tree boost/proto boost/python boost/random boost/random/detail boost/range boost/ratio boost/regex boost/serialization boost/signals boost/smart_ptr boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/tr1 boost/type_traits boost/typeof boost/unordered boost/utility boost/uuid boost/variant boost/wave boost/xpressive doc libs libs/algorithm libs/algorithm/doc libs/algorithm/example libs/algorithm/minmax libs/algorithm/minmax/test libs/algorithm/string libs/algorithm/string/doc libs/algorithm/string/test libs/algorithm/test libs/algorithm/test/search_test_data libs/array libs/array/test libs/atomic libs/bimap libs/chrono/example libs/chrono/src libs/chrono/test libs/chrono/test/clock libs/chrono/test/duration libs/chrono/test/io libs/chrono/test/time_point libs/chrono/test/traits libs/container libs/date_time libs/date_time/src/gregorian libs/detail libs/filesystem libs/function libs/function/test libs/functional libs/functional/overloaded_function libs/fusion libs/geometry libs/geometry/doc libs/geometry/doc/concept libs/geometry/doc/doxy libs/geometry/doc/generated libs/geometry/doc/html libs/geometry/doc/reference libs/geometry/doc/src libs/geometry/example libs/geometry/test libs/graph/doc libs/graph/example libs/graph/src libs/graph/test libs/graph_parallel libs/heap libs/icl libs/icl/doc libs/icl/doc/html libs/icl/doc/html/boost/icl libs/icl/doc/html/header/boost/icl libs/icl/example libs/icl/test libs/icl/test/test_doc_code_ libs/integer libs/interprocess libs/intrusive libs/io libs/io/doc libs/iostreams libs/iostreams/src libs/iostreams/test libs/iterator libs/local_function libs/locale libs/lockfree libs/math libs/math/doc/sf_and_dist libs/math/test libs/move libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/multiprecision libs/numeric/odeint libs/numeric/odeint/doc libs/numeric/ublas libs/numeric/ublas/doc libs/parameter/doc/html libs/phoenix/doc libs/phoenix/doc/examples libs/pool libs/preprocessor libs/program_options libs/property_tree libs/python libs/random/test libs/range libs/ratio libs/regex libs/scope_exit libs/serialization libs/serialization/example libs/serialization/src libs/serialization/test libs/signals libs/signals/src libs/smart_ptr libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/example/qi/compiler_tutorial/conjure2 libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/timer libs/tr1 libs/type_traits libs/typeof/doc libs/unordered libs/utility libs/utility/doc libs/utility/identity_type libs/utility/swap/test libs/utility/test libs/uuid libs/wave more status tools tools/bcp tools/boostbook tools/build/v2 tools/inspect tools/inspect/build tools/quickbook tools/regression tools/regression/src tools/release tools/wave
From: marshall_at_[hidden]
Date: 2013-02-25 13:43:31
Author: marshall
Date: 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
New Revision: 83154
URL: http://svn.boost.org/trac/boost/changeset/83154
Log:
Merged boost::algorithm::gather and updated tests for Utility, Algorithm and Utility libraries
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost/ (props changed)
branches/release/boost-build.jam (props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/boost/algorithm/ (props changed)
branches/release/boost/algorithm/clamp.hpp (props changed)
branches/release/boost/algorithm/cxx11/all_of.hpp (props changed)
branches/release/boost/algorithm/cxx11/any_of.hpp (props changed)
branches/release/boost/algorithm/cxx11/copy_if.hpp (props changed)
branches/release/boost/algorithm/cxx11/copy_n.hpp (props changed)
branches/release/boost/algorithm/cxx11/find_if_not.hpp (props changed)
branches/release/boost/algorithm/cxx11/iota.hpp (props changed)
branches/release/boost/algorithm/cxx11/is_partitioned.hpp (props changed)
branches/release/boost/algorithm/cxx11/is_permutation.hpp (props changed)
branches/release/boost/algorithm/cxx11/is_sorted.hpp (props changed)
branches/release/boost/algorithm/cxx11/none_of.hpp (props changed)
branches/release/boost/algorithm/cxx11/one_of.hpp (props changed)
branches/release/boost/algorithm/cxx11/partition_copy.hpp (props changed)
branches/release/boost/algorithm/cxx11/partition_point.hpp (props changed)
branches/release/boost/algorithm/hex.hpp (props changed)
branches/release/boost/algorithm/minmax_element.hpp (props changed)
branches/release/boost/algorithm/searching/ (props changed)
branches/release/boost/algorithm/searching/boyer_moore.hpp (props changed)
branches/release/boost/algorithm/searching/boyer_moore_horspool.hpp (props changed)
branches/release/boost/algorithm/searching/detail/bm_traits.hpp (props changed)
branches/release/boost/algorithm/searching/detail/debugging.hpp (props changed)
branches/release/boost/algorithm/searching/knuth_morris_pratt.hpp (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/algorithm/string/detail/case_conv.hpp (props changed)
branches/release/boost/algorithm/string/detail/classification.hpp (props changed)
branches/release/boost/algorithm/string/find.hpp (props changed)
branches/release/boost/algorithm/string/find_iterator.hpp (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/atomic/ (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/bimap.hpp (props changed)
branches/release/boost/chrono/detail/ (props changed)
branches/release/boost/chrono/io/ (props changed)
branches/release/boost/chrono/io_v1/ (props changed)
branches/release/boost/concept_check.hpp (props changed)
branches/release/boost/container/ (props changed)
branches/release/boost/cregex.hpp (props changed)
branches/release/boost/cstdint.hpp (props changed)
branches/release/boost/date_time/ (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/fenv.hpp (props changed)
branches/release/boost/detail/interlocked.hpp (props changed)
branches/release/boost/detail/scoped_enum_emulation.hpp (props changed)
branches/release/boost/dynamic_bitset/dynamic_bitset.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/filesystem.hpp (props changed)
branches/release/boost/foreach.hpp (props changed)
branches/release/boost/function/ (props changed)
branches/release/boost/function/function_template.hpp (props changed)
branches/release/boost/functional/ (props changed)
branches/release/boost/functional/overloaded_function/ (props changed)
branches/release/boost/functional/overloaded_function.hpp (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/geometry/ (props changed)
branches/release/boost/geometry/algorithms/ (props changed)
branches/release/boost/geometry/arithmetic/ (props changed)
branches/release/boost/geometry/core/ (props changed)
branches/release/boost/geometry/domains/ (props changed)
branches/release/boost/geometry/geometries/ (props changed)
branches/release/boost/geometry/geometry.hpp (props changed)
branches/release/boost/geometry/io/ (props changed)
branches/release/boost/geometry/io/dsv/ (props changed)
branches/release/boost/geometry/iterators/ (props changed)
branches/release/boost/geometry/multi/ (props changed)
branches/release/boost/geometry/policies/ (props changed)
branches/release/boost/geometry/strategies/ (props changed)
branches/release/boost/geometry/util/ (props changed)
branches/release/boost/geometry/views/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/graph/adjacency_list.hpp (props changed)
branches/release/boost/graph/astar_search.hpp (props changed)
branches/release/boost/graph/boykov_kolmogorov_max_flow.hpp (props changed)
branches/release/boost/graph/compressed_sparse_row_graph.hpp (props changed)
branches/release/boost/graph/detail/ (props changed)
branches/release/boost/graph/detail/adjacency_list.hpp (props changed)
branches/release/boost/graph/detail/d_ary_heap.hpp (props changed)
branches/release/boost/graph/detail/labeled_graph_traits.hpp (props changed)
branches/release/boost/graph/dijkstra_shortest_paths_no_color_map.hpp (props changed)
branches/release/boost/graph/directed_graph.hpp (props changed)
branches/release/boost/graph/distributed/selector.hpp (props changed)
branches/release/boost/graph/graph_concepts.hpp (props changed)
branches/release/boost/graph/graph_traits.hpp (props changed)
branches/release/boost/graph/graphml.hpp (props changed)
branches/release/boost/graph/kamada_kawai_spring_layout.hpp (props changed)
branches/release/boost/graph/labeled_graph.hpp (props changed)
branches/release/boost/graph/metric_tsp_approx.hpp (props changed)
branches/release/boost/graph/named_graph.hpp (props changed)
branches/release/boost/graph/properties.hpp (props changed)
branches/release/boost/graph/property_maps/constant_property_map.hpp (props changed)
branches/release/boost/graph/reverse_graph.hpp (props changed)
branches/release/boost/graph/tiernan_all_cycles.hpp (props changed)
branches/release/boost/graph/undirected_graph.hpp (props changed)
branches/release/boost/graph/vf2_sub_graph_iso.hpp (props changed)
branches/release/boost/heap/ (props changed)
branches/release/boost/icl/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/integer.hpp (props changed)
branches/release/boost/integer_fwd.hpp (props changed)
branches/release/boost/integer_traits.hpp (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/io/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/iterator/ (props changed)
branches/release/boost/iterator/iterator_facade.hpp (props changed)
branches/release/boost/lambda/ (props changed)
branches/release/boost/local_function/ (props changed)
branches/release/boost/local_function.hpp (props changed)
branches/release/boost/locale/ (props changed)
branches/release/boost/locale.hpp (props changed)
branches/release/boost/lockfree/ (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/move/ (props changed)
branches/release/boost/msm/ (props changed)
branches/release/boost/msm/active_state_switching_policies.hpp (props changed)
branches/release/boost/msm/back/ (props changed)
branches/release/boost/msm/back/args.hpp (props changed)
branches/release/boost/msm/back/bind_helpers.hpp (props changed)
branches/release/boost/msm/back/common_types.hpp (props changed)
branches/release/boost/msm/back/copy_policies.hpp (props changed)
branches/release/boost/msm/back/default_compile_policy.hpp (props changed)
branches/release/boost/msm/back/dispatch_table.hpp (props changed)
branches/release/boost/msm/back/favor_compile_time.hpp (props changed)
branches/release/boost/msm/back/fold_to_list.hpp (props changed)
branches/release/boost/msm/back/history_policies.hpp (props changed)
branches/release/boost/msm/back/metafunctions.hpp (props changed)
branches/release/boost/msm/back/mpl_graph_fsm_check.hpp (props changed)
branches/release/boost/msm/back/no_fsm_check.hpp (props changed)
branches/release/boost/msm/back/queue_container_circular.hpp (props changed)
branches/release/boost/msm/back/queue_container_deque.hpp (props changed)
branches/release/boost/msm/back/state_machine.hpp (props changed)
branches/release/boost/msm/back/tools.hpp (props changed)
branches/release/boost/msm/common.hpp (props changed)
branches/release/boost/msm/event_traits.hpp (props changed)
branches/release/boost/msm/front/ (props changed)
branches/release/boost/msm/front/common_states.hpp (props changed)
branches/release/boost/msm/front/completion_event.hpp (props changed)
branches/release/boost/msm/front/detail/ (props changed)
branches/release/boost/msm/front/detail/common_states.hpp (props changed)
branches/release/boost/msm/front/detail/row2_helper.hpp (props changed)
branches/release/boost/msm/front/euml/ (props changed)
branches/release/boost/msm/front/euml/algorithm.hpp (props changed)
branches/release/boost/msm/front/euml/common.hpp (props changed)
branches/release/boost/msm/front/euml/container.hpp (props changed)
branches/release/boost/msm/front/euml/euml.hpp (props changed)
branches/release/boost/msm/front/euml/euml_typeof.hpp (props changed)
branches/release/boost/msm/front/euml/guard_grammar.hpp (props changed)
branches/release/boost/msm/front/euml/iteration.hpp (props changed)
branches/release/boost/msm/front/euml/operator.hpp (props changed)
branches/release/boost/msm/front/euml/phoenix_placeholders.hpp (props changed)
branches/release/boost/msm/front/euml/querying.hpp (props changed)
branches/release/boost/msm/front/euml/state_grammar.hpp (props changed)
branches/release/boost/msm/front/euml/stl.hpp (props changed)
branches/release/boost/msm/front/euml/stt_grammar.hpp (props changed)
branches/release/boost/msm/front/euml/transformation.hpp (props changed)
branches/release/boost/msm/front/functor_row.hpp (props changed)
branches/release/boost/msm/front/internal_row.hpp (props changed)
branches/release/boost/msm/front/row2.hpp (props changed)
branches/release/boost/msm/front/state_machine_def.hpp (props changed)
branches/release/boost/msm/front/states.hpp (props changed)
branches/release/boost/msm/mpl_graph/ (props changed)
branches/release/boost/msm/msm_grammar.hpp (props changed)
branches/release/boost/msm/proto_config.hpp (props changed)
branches/release/boost/msm/row_tags.hpp (props changed)
branches/release/boost/multi_index/ (props changed)
branches/release/boost/multiprecision/ (props changed)
branches/release/boost/numeric/odeint/ (props changed)
branches/release/boost/numeric/odeint.hpp (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/numeric/ublas/functional.hpp (props changed)
branches/release/boost/parameter/ (props changed)
branches/release/boost/parameter.hpp (props changed)
branches/release/boost/pending/property.hpp (props changed)
branches/release/boost/pool/ (props changed)
branches/release/boost/preprocessor/ (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/property_tree/ (props changed)
branches/release/boost/proto/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/random/ (props changed)
branches/release/boost/random/detail/integer_log2.hpp (props changed)
branches/release/boost/random/discrete_distribution.hpp (props changed)
branches/release/boost/random/piecewise_constant_distribution.hpp (props changed)
branches/release/boost/random/piecewise_linear_distribution.hpp (props changed)
branches/release/boost/random/seed_seq.hpp (props changed)
branches/release/boost/random/subtract_with_carry.hpp (props changed)
branches/release/boost/range/ (props changed)
branches/release/boost/ratio/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/regex.h (props changed)
branches/release/boost/regex.hpp (props changed)
branches/release/boost/regex_fwd.hpp (props changed)
branches/release/boost/scope_exit.hpp (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2.hpp (props changed)
branches/release/boost/smart_ptr/ (props changed)
branches/release/boost/smart_ptr/enable_shared_from_raw.hpp (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (props changed)
branches/release/boost/statechart/ (props changed)
branches/release/boost/static_assert.hpp (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/timer.hpp (props changed)
branches/release/boost/token_functions.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/type_traits.hpp (props changed)
branches/release/boost/typeof/message.hpp (props changed)
branches/release/boost/typeof/register_functions.hpp (props changed)
branches/release/boost/typeof/register_functions_iterate.hpp (props changed)
branches/release/boost/typeof/typeof.hpp (props changed)
branches/release/boost/typeof/unsupported.hpp (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/boost/utility/ (props changed)
branches/release/boost/utility/identity_type.hpp (props changed)
branches/release/boost/utility/result_of.hpp (props changed)
branches/release/boost/utility/value_init.hpp (props changed)
branches/release/boost/uuid/ (props changed)
branches/release/boost/variant/ (props changed)
branches/release/boost/version.hpp (props changed)
branches/release/boost/wave/ (props changed)
branches/release/boost/xpressive/ (props changed)
branches/release/boostcpp.jam (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (props changed)
branches/release/doc/ (props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/libs/ (props changed)
branches/release/libs/algorithm/ (props changed)
branches/release/libs/algorithm/doc/Jamfile.v2 (props changed)
branches/release/libs/algorithm/doc/algorithm.qbk (contents, props changed)
branches/release/libs/algorithm/doc/all_of.qbk (props changed)
branches/release/libs/algorithm/doc/any_of.qbk (props changed)
branches/release/libs/algorithm/doc/boyer_moore.qbk (props changed)
branches/release/libs/algorithm/doc/boyer_moore_horspool.qbk (props changed)
branches/release/libs/algorithm/doc/clamp-hpp.qbk (props changed)
branches/release/libs/algorithm/doc/hex.qbk (props changed)
branches/release/libs/algorithm/doc/is_partitioned.qbk (props changed)
branches/release/libs/algorithm/doc/knuth_morris_pratt.qbk (props changed)
branches/release/libs/algorithm/doc/none_of.qbk (props changed)
branches/release/libs/algorithm/doc/one_of.qbk (props changed)
branches/release/libs/algorithm/doc/ordered-hpp.qbk (props changed)
branches/release/libs/algorithm/doc/partition_point.qbk (props changed)
branches/release/libs/algorithm/example/Jamfile.v2 (props changed)
branches/release/libs/algorithm/example/clamp_example.cpp (props changed)
branches/release/libs/algorithm/example/search_example.cpp (props changed)
branches/release/libs/algorithm/minmax/index.html (props changed)
branches/release/libs/algorithm/string/ (props changed)
branches/release/libs/algorithm/string/doc/Jamfile.v2 (props changed)
branches/release/libs/algorithm/string/doc/usage.xml (props changed)
branches/release/libs/algorithm/string/test/find_test.cpp (contents, props changed)
branches/release/libs/algorithm/string/test/split_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/ (props changed)
branches/release/libs/algorithm/test/Jamfile.v2 (contents, props changed)
branches/release/libs/algorithm/test/all_of_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/any_of_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/clamp_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/copy_if_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/copy_n_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/empty_search_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/find_if_not_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/hex_fail1.cpp (contents, props changed)
branches/release/libs/algorithm/test/hex_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/hex_test2.cpp (contents, props changed)
branches/release/libs/algorithm/test/hex_test3.cpp (contents, props changed)
branches/release/libs/algorithm/test/hex_test4.cpp (contents, props changed)
branches/release/libs/algorithm/test/iota_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/is_partitioned_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/is_permutation_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/none_of_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/one_of_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/ordered_test.cpp (contents, props changed)
branches/release/libs/algorithm/test/partition_copy_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/partition_point_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/search_fail1.cpp (contents, props changed)
branches/release/libs/algorithm/test/search_fail2.cpp (contents, props changed)
branches/release/libs/algorithm/test/search_fail3.cpp (contents, props changed)
branches/release/libs/algorithm/test/search_test1.cpp (contents, props changed)
branches/release/libs/algorithm/test/search_test2.cpp (contents, props changed)
branches/release/libs/algorithm/test/search_test3.cpp (contents, props changed)
branches/release/libs/algorithm/test/search_test_data/0001.corpus (props changed)
branches/release/libs/algorithm/test/search_test_data/0001b.pat (props changed)
branches/release/libs/algorithm/test/search_test_data/0001e.pat (props changed)
branches/release/libs/algorithm/test/search_test_data/0001f.pat (props changed)
branches/release/libs/algorithm/test/search_test_data/0001n.pat (props changed)
branches/release/libs/algorithm/test/search_test_data/0002b.pat (props changed)
branches/release/libs/algorithm/test/search_test_data/0002e.pat (props changed)
branches/release/libs/algorithm/test/search_test_data/0002f.pat (props changed)
branches/release/libs/algorithm/test/search_test_data/0002n.pat (props changed)
branches/release/libs/array/ (props changed)
branches/release/libs/array/test/Jamfile.v2 (contents, props changed)
branches/release/libs/array/test/array0.cpp (contents, props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/array/test/array6.cpp (contents, props changed)
branches/release/libs/array/test/array_hash.cpp (contents, props changed)
branches/release/libs/atomic/ (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/chrono/example/ (props changed)
branches/release/libs/chrono/src/ (props changed)
branches/release/libs/chrono/test/clock/ (props changed)
branches/release/libs/chrono/test/duration/ (props changed)
branches/release/libs/chrono/test/io/ (props changed)
branches/release/libs/chrono/test/time_point/ (props changed)
branches/release/libs/chrono/test/traits/ (props changed)
branches/release/libs/chrono/test/win32_test.cpp (props changed)
branches/release/libs/container/ (props changed)
branches/release/libs/date_time/ (props changed)
branches/release/libs/date_time/src/gregorian/ (props changed)
branches/release/libs/detail/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/function/ (props changed)
branches/release/libs/function/test/function_test.cpp (props changed)
branches/release/libs/functional/ (props changed)
branches/release/libs/functional/overloaded_function/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/geometry/ (props changed)
branches/release/libs/geometry/doc/ (props changed)
branches/release/libs/geometry/doc/Jamfile.v2 (props changed)
branches/release/libs/geometry/doc/about_documentation.qbk (props changed)
branches/release/libs/geometry/doc/acknowledgments.qbk (props changed)
branches/release/libs/geometry/doc/compiling.qbk (props changed)
branches/release/libs/geometry/doc/concept/ (props changed)
branches/release/libs/geometry/doc/copyright_note_policy.txt (props changed)
branches/release/libs/geometry/doc/design_rationale.qbk (props changed)
branches/release/libs/geometry/doc/doxy/ (props changed)
branches/release/libs/geometry/doc/generated/ (props changed)
branches/release/libs/geometry/doc/geometry.qbk (props changed)
branches/release/libs/geometry/doc/html/ (props changed)
branches/release/libs/geometry/doc/imports.qbk (props changed)
branches/release/libs/geometry/doc/introduction.qbk (props changed)
branches/release/libs/geometry/doc/make_qbk.py (props changed)
branches/release/libs/geometry/doc/matrix.qbk (props changed)
branches/release/libs/geometry/doc/quickref.xml (props changed)
branches/release/libs/geometry/doc/quickstart.qbk (props changed)
branches/release/libs/geometry/doc/readme.txt (props changed)
branches/release/libs/geometry/doc/reference/ (props changed)
branches/release/libs/geometry/doc/reference.qbk (props changed)
branches/release/libs/geometry/doc/release_notes.qbk (props changed)
branches/release/libs/geometry/doc/src/ (props changed)
branches/release/libs/geometry/example/ (props changed)
branches/release/libs/geometry/index.html (props changed)
branches/release/libs/geometry/test/ (props changed)
branches/release/libs/graph/doc/ (props changed)
branches/release/libs/graph/doc/astar_search.html (props changed)
branches/release/libs/graph/doc/graph_concepts.html (props changed)
branches/release/libs/graph/doc/push_relabel_max_flow.html (props changed)
branches/release/libs/graph/doc/read_graphml.html (props changed)
branches/release/libs/graph/doc/read_graphml.rst (props changed)
branches/release/libs/graph/doc/small_world_generator.html (props changed)
branches/release/libs/graph/doc/table_of_contents.html (props changed)
branches/release/libs/graph/doc/vf2_sub_graph_iso.html (props changed)
branches/release/libs/graph/example/ (props changed)
branches/release/libs/graph/example/Jamfile.v2 (props changed)
branches/release/libs/graph/example/astar-cities.cpp (props changed)
branches/release/libs/graph/example/undirected_adjacency_list.cpp (props changed)
branches/release/libs/graph/example/undirected_adjacency_list.expected (props changed)
branches/release/libs/graph/example/vf2_sub_graph_iso_multi_example.cpp (props changed)
branches/release/libs/graph/src/graphml.cpp (props changed)
branches/release/libs/graph/test/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/heap/ (props changed)
branches/release/libs/icl/ (props changed)
branches/release/libs/icl/doc/ (props changed)
branches/release/libs/icl/doc/html/ (props changed)
branches/release/libs/icl/doc/html/boost/icl/ (props changed)
branches/release/libs/icl/doc/html/header/boost/icl/ (props changed)
branches/release/libs/icl/example/ (props changed)
branches/release/libs/icl/test/ (props changed)
branches/release/libs/icl/test/test_doc_code_/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/io/ (props changed)
branches/release/libs/io/doc/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/iostreams/src/file_descriptor.cpp (props changed)
branches/release/libs/iostreams/test/Jamfile.v2 (props changed)
branches/release/libs/iostreams/test/windows_pipe_test.cpp (props changed)
branches/release/libs/iterator/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/local_function/ (props changed)
branches/release/libs/locale/ (props changed)
branches/release/libs/lockfree/ (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/math/doc/sf_and_dist/faq.qbk (props changed)
branches/release/libs/math/test/s_.ipp (props changed)
branches/release/libs/move/ (props changed)
branches/release/libs/mpi/build/ (props changed)
branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
branches/release/libs/msm/ (props changed)
branches/release/libs/multiprecision/ (props changed)
branches/release/libs/numeric/odeint/ (props changed)
branches/release/libs/numeric/odeint/doc/ (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/parameter/doc/html/index.html (props changed)
branches/release/libs/phoenix/doc/basics.qbk (props changed)
branches/release/libs/phoenix/doc/examples/extending_actors.qbk (props changed)
branches/release/libs/phoenix/doc/organisation.qbk (props changed)
branches/release/libs/pool/ (props changed)
branches/release/libs/preprocessor/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/random/test/Jamfile.v2 (props changed)
branches/release/libs/random/test/test_discrete_distribution.cpp (props changed)
branches/release/libs/random/test/test_piecewise_constant_distribution.cpp (props changed)
branches/release/libs/random/test/test_piecewise_linear_distribution.cpp (props changed)
branches/release/libs/random/test/test_seed_seq.cpp (props changed)
branches/release/libs/random/test/test_zero_seed.cpp (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/ratio/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/scope_exit/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/serialization/example/ (props changed)
branches/release/libs/serialization/src/ (props changed)
branches/release/libs/serialization/test/test_diamond_complex.cpp (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals/src/named_slot_map.cpp (props changed)
branches/release/libs/smart_ptr/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/classic/example/ (props changed)
branches/release/libs/spirit/doc/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/example/qi/compiler_tutorial/conjure2/ (props changed)
branches/release/libs/spirit/phoenix/ (props changed)
branches/release/libs/spirit/test/ (props changed)
branches/release/libs/spirit/test/qi/optional.cpp (props changed)
branches/release/libs/statechart/ (props changed)
branches/release/libs/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/typeof/doc/typeof.qbk (props changed)
branches/release/libs/unordered/ (props changed)
branches/release/libs/utility/ (props changed)
branches/release/libs/utility/assert.html (props changed)
branches/release/libs/utility/assert_test.cpp (props changed)
branches/release/libs/utility/doc/ (props changed)
branches/release/libs/utility/doc/string_ref.qbk (props changed)
branches/release/libs/utility/identity_type/ (props changed)
branches/release/libs/utility/in_place_factories.html (props changed)
branches/release/libs/utility/index.html (props changed)
branches/release/libs/utility/swap.html (props changed)
branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
branches/release/libs/utility/test/result_of_test.cpp (props changed)
branches/release/libs/utility/value_init.htm (props changed)
branches/release/libs/utility/value_init_test.cpp (props changed)
branches/release/libs/uuid/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (props changed)
branches/release/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/status/expected_results.xml (props changed)
branches/release/status/explicit-failures-markup.xml (props changed)
branches/release/status/explicit-failures.xsd (props changed)
branches/release/tools/ (props changed)
branches/release/tools/bcp/ (props changed)
branches/release/tools/boostbook/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/inspect/build/Jamfile.v2 (props changed)
branches/release/tools/inspect/deprecated_macro_check.cpp (props changed)
branches/release/tools/inspect/inspect.cpp (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/regression/src/library_status.cpp (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/libs/algorithm/doc/algorithm.qbk | 1
branches/release/libs/algorithm/minmax/test/Jamfile.v2 | 9 ++++-
branches/release/libs/algorithm/minmax/test/minmax_element_test.cpp | 9 ++--
branches/release/libs/algorithm/minmax/test/minmax_test.cpp | 8 ++--
branches/release/libs/algorithm/string/test/Jamfile.v2 | 23 ++++++++-----
branches/release/libs/algorithm/string/test/conv_test.cpp | 7 +--
branches/release/libs/algorithm/string/test/find_format_test.cpp | 7 +--
branches/release/libs/algorithm/string/test/find_test.cpp | 29 ++++++++--------
branches/release/libs/algorithm/string/test/join_test.cpp | 9 ++--
branches/release/libs/algorithm/string/test/predicate_test.cpp | 8 +--
branches/release/libs/algorithm/string/test/regex_test.cpp | 7 +--
branches/release/libs/algorithm/string/test/replace_test.cpp | 22 +++++-------
branches/release/libs/algorithm/string/test/split_test.cpp | 17 ++++++---
branches/release/libs/algorithm/string/test/trim_test.cpp | 8 +--
branches/release/libs/algorithm/test/Jamfile.v2 | 67 +++++++++++++++++++++++----------------
branches/release/libs/algorithm/test/all_of_test.cpp | 7 ++-
branches/release/libs/algorithm/test/any_of_test.cpp | 7 ++-
branches/release/libs/algorithm/test/clamp_test.cpp | 6 +-
branches/release/libs/algorithm/test/copy_if_test1.cpp | 11 +++--
branches/release/libs/algorithm/test/copy_n_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/empty_search_test.cpp | 8 +--
branches/release/libs/algorithm/test/find_if_not_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/hex_fail1.cpp | 4 +-
branches/release/libs/algorithm/test/hex_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/hex_test2.cpp | 7 ++-
branches/release/libs/algorithm/test/hex_test3.cpp | 7 ++-
branches/release/libs/algorithm/test/hex_test4.cpp | 8 ++--
branches/release/libs/algorithm/test/iota_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/is_partitioned_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/is_permutation_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/none_of_test.cpp | 7 ++-
branches/release/libs/algorithm/test/one_of_test.cpp | 7 ++-
branches/release/libs/algorithm/test/ordered_test.cpp | 7 ++-
branches/release/libs/algorithm/test/partition_copy_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/partition_point_test1.cpp | 7 ++-
branches/release/libs/algorithm/test/search_fail1.cpp | 4 -
branches/release/libs/algorithm/test/search_fail2.cpp | 4 -
branches/release/libs/algorithm/test/search_fail3.cpp | 3 -
branches/release/libs/algorithm/test/search_test1.cpp | 6 +-
branches/release/libs/algorithm/test/search_test2.cpp | 9 ++--
branches/release/libs/algorithm/test/search_test3.cpp | 9 ++--
branches/release/libs/algorithm/test/search_test4.cpp | 9 ++--
branches/release/libs/array/test/Jamfile.v2 | 11 ++++-
branches/release/libs/array/test/array0.cpp | 58 +++++++++-------------------------
branches/release/libs/array/test/array6.cpp | 40 +++++++++--------------
branches/release/libs/array/test/array_hash.cpp | 40 ++++++++++-------------
branches/release/libs/utility/test/Jamfile.v2 | 9 ++++-
branches/release/libs/utility/test/string_ref_test1.cpp | 12 ++----
branches/release/libs/utility/test/string_ref_test2.cpp | 10 ++--
49 files changed, 296 insertions(+), 301 deletions(-)
Modified: branches/release/libs/algorithm/doc/algorithm.qbk
==============================================================================
--- branches/release/libs/algorithm/doc/algorithm.qbk (original)
+++ branches/release/libs/algorithm/doc/algorithm.qbk 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -58,6 +58,7 @@
[section:Misc Other Algorithms]
[include clamp-hpp.qbk]
+[include gather.qbk]
[include hex.qbk]
[endsect]
Modified: branches/release/libs/algorithm/minmax/test/Jamfile.v2
==============================================================================
--- branches/release/libs/algorithm/minmax/test/Jamfile.v2 (original)
+++ branches/release/libs/algorithm/minmax/test/Jamfile.v2 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,11 +9,16 @@
import testing ;
+alias unit_test_framework
+ : # sources
+ /boost//unit_test_framework
+ ;
+
{
test-suite algorithm/minmax:
- : [ run minmax_element_test.cpp
+ : [ run minmax_element_test.cpp unit_test_framework
: : : : minmax_element ]
- [ run minmax_test.cpp
+ [ run minmax_test.cpp unit_test_framework
: : : : minmax ]
;
}
Modified: branches/release/libs/algorithm/minmax/test/minmax_element_test.cpp
==============================================================================
--- branches/release/libs/algorithm/minmax/test/minmax_element_test.cpp (original)
+++ branches/release/libs/algorithm/minmax/test/minmax_element_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -15,9 +15,11 @@
#include <boost/config.hpp> /* prevents some nasty warns in MSVC */
#include <boost/algorithm/minmax_element.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
#include <boost/iterator/reverse_iterator.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+
class custom {
int m_x;
friend bool operator<(custom const& x, custom const& y);
@@ -225,17 +227,14 @@
test_range(first, last, n);
}
-int test_main( int argc, char* argv[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
#ifndef BOOST_NO_STDC_NAMESPACE
using std::atoi;
#endif
int n = 100;
- if (argc > 1) n = atoi(argv[1]);
test<int>(n);
test<custom>(n);
-
- return 0;
}
Modified: branches/release/libs/algorithm/minmax/test/minmax_test.cpp
==============================================================================
--- branches/release/libs/algorithm/minmax/test/minmax_test.cpp (original)
+++ branches/release/libs/algorithm/minmax/test/minmax_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -8,7 +8,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/minmax.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
class custom {
int m_x;
@@ -76,10 +78,8 @@
BOOST_CHECK_EQUAL( counter, 1);
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test<int>(); // ("builtin");
test<custom>(); // ("custom ");
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/Jamfile.v2
==============================================================================
--- branches/release/libs/algorithm/string/test/Jamfile.v2 (original)
+++ branches/release/libs/algorithm/string/test/Jamfile.v2 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,58 +9,63 @@
import testing ;
+alias unit_test_framework
+ : # sources
+ /boost//unit_test_framework
+ ;
+
test-suite algorithm/string
: [ run
- trim_test.cpp
+ trim_test.cpp unit_test_framework
: :
:
: trim
]
[ run
- conv_test.cpp
+ conv_test.cpp unit_test_framework
: :
:
: conv
]
[ run
- predicate_test.cpp
+ predicate_test.cpp unit_test_framework
: :
:
: predicate
]
[ run
- find_test.cpp
+ find_test.cpp unit_test_framework
: :
:
: find
]
[ run
- split_test.cpp
+ split_test.cpp unit_test_framework
: :
:
: split
]
[ run
- join_test.cpp
+ join_test.cpp unit_test_framework
: :
:
: join
]
[ run
- replace_test.cpp
+ replace_test.cpp unit_test_framework
: :
:
: replace
]
[ run
- regex_test.cpp
+ regex_test.cpp unit_test_framework
../../../regex/build//boost_regex
: :
:
: regex
]
[ run
- find_format_test.cpp
+ find_format_test.cpp unit_test_framework
: :
:
: find_format
Modified: branches/release/libs/algorithm/string/test/conv_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/conv_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/conv_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -10,7 +10,8 @@
#include <boost/algorithm/string/case_conv.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <iostream>
@@ -87,9 +88,7 @@
}
// test main
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
conv_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/find_format_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/find_format_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/find_format_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -12,7 +12,8 @@
#include <boost/algorithm/string/formatter.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <boost/test/test_tools.hpp>
@@ -154,10 +155,8 @@
BOOST_CHECK_EQUAL(output, source);
}
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
find_format_test();
find_format_all_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/find_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/find_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/find_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -12,7 +12,8 @@
#include <boost/algorithm/string/split.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -45,7 +46,7 @@
// find_first
- BOOST_CHECKPOINT( "find_first" );
+ BOOST_TEST_CHECKPOINT( "find_first" );
nc_result=find_first( str1, string("abc") );
BOOST_CHECK(
@@ -66,7 +67,7 @@
BOOST_CHECK(( (ch_result.begin() - pch1 ) == 3) && ( (ch_result.end() - pch1 ) == 6 ) );
// find_last
- BOOST_CHECKPOINT( "find_last" );
+ BOOST_TEST_CHECKPOINT( "find_last" );
nc_result=find_last( str1, string("abc") );
BOOST_CHECK(
@@ -87,7 +88,7 @@
BOOST_CHECK(( (ch_result.begin() - pch1 ) == 15) && ( (ch_result.end() - pch1 ) == 18 ) );
// find_nth
- BOOST_CHECKPOINT( "find_nth" );
+ BOOST_TEST_CHECKPOINT( "find_nth" );
nc_result=find_nth( str1, string("abc"), 1 );
BOOST_CHECK(
@@ -125,7 +126,7 @@
BOOST_CHECK(( (ch_result.begin() - pch1 ) == 9) && ( (ch_result.end() - pch1 ) == 12 ) );
// find_head
- BOOST_CHECKPOINT( "find_head" );
+ BOOST_TEST_CHECKPOINT( "find_head" );
nc_result=find_head( str1, 6 );
BOOST_CHECK(
@@ -146,7 +147,7 @@
BOOST_CHECK( ( (ch_result.begin() - pch1 ) == 0 ) && ( (ch_result.end() - pch1 ) == 6 ) );
// find_tail
- BOOST_CHECKPOINT( "find_tail" );
+ BOOST_TEST_CHECKPOINT( "find_tail" );
nc_result=find_tail( str1, 6 );
BOOST_CHECK(
@@ -168,7 +169,7 @@
BOOST_CHECK( ( (ch_result.begin() - pch1 ) == 15 ) && ( (ch_result.end() - pch1 ) == 21 ) );
// find_token
- BOOST_CHECKPOINT( "find_token" );
+ BOOST_TEST_CHECKPOINT( "find_token" );
nc_result=find_token( str1, is_any_of("abc"), token_compress_on );
BOOST_CHECK(
@@ -194,7 +195,7 @@
BOOST_CHECK( ( (ch_result.begin() - pch1 ) == 3 ) && ( (ch_result.end() - pch1 ) == 4 ) );
// generic find
- BOOST_CHECKPOINT( "generic find" );
+ BOOST_TEST_CHECKPOINT( "generic find" );
nc_result=find(str1, first_finder(string("abc")));
BOOST_CHECK(
@@ -207,7 +208,7 @@
( (cv_result.end()-str1.begin()) == 6) );
// multi-type comparison test
- BOOST_CHECKPOINT( "multi-type" );
+ BOOST_TEST_CHECKPOINT( "multi-type" );
nc_vresult=find_first( vec1, string("abc") );
BOOST_CHECK(
@@ -220,7 +221,7 @@
( (cv_result.end()-str1.begin()) == 6) );
// overflow test
- BOOST_CHECKPOINT( "overflow" );
+ BOOST_TEST_CHECKPOINT( "overflow" );
nc_result=find_first( str2, string("abcd") );
BOOST_CHECK( nc_result.begin()==nc_result.end() );
@@ -233,7 +234,7 @@
BOOST_CHECK( string( cv_result.begin(), cv_result.end() )== string("abc") );
// Empty string test
- BOOST_CHECKPOINT( "empty" );
+ BOOST_TEST_CHECKPOINT( "empty" );
nc_result=find_first( str3, string("abcd") );
BOOST_CHECK( nc_result.begin()==nc_result.end() );
@@ -251,7 +252,7 @@
BOOST_CHECK( osstr.str()=="abc" );
// Empty string test
- BOOST_CHECKPOINT( "overlapping" );
+ BOOST_TEST_CHECKPOINT( "overlapping" );
std::string overlap_target("aaaa");
std::vector<boost::iterator_range<std::string::iterator> > overlap_results;
@@ -266,9 +267,7 @@
}
// test main
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
find_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/join_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/join_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/join_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -13,7 +13,8 @@
#include <boost/algorithm/string/predicate.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -70,10 +71,8 @@
BOOST_CHECK( equals(join_if(tokens3, "-", is_not_empty), "") );
}
-// test main
-int test_main( int, char*[] )
+
+BOOST_AUTO_TEST_CASE( test_main )
{
join_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/predicate_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/predicate_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/predicate_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,8 @@
#include <boost/algorithm/string/classification.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -152,11 +153,8 @@
#undef TEST_CLASS
-// test main
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
predicate_test();
classification_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/regex_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/regex_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/regex_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -15,7 +15,8 @@
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -149,11 +150,9 @@
BOOST_CHECK( str1==string("123AxXxCa23ca456c321") );
}
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
find_test();
join_test();
replace_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/replace_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/replace_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/replace_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -16,7 +16,8 @@
#include <boost/algorithm/string/classification.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -56,14 +57,14 @@
#define C_ ,
#define TEST_ALGO( Algo, Input, Params, Output ) \
{\
- BOOST_CHECKPOINT( #Algo " - Copy" );\
+ BOOST_TEST_CHECKPOINT( #Algo " - Copy" );\
\
string str1(Input);\
\
/* Copy test */ \
BOOST_CHECK( Algo##_copy( str1, Params )==Output );\
\
- BOOST_CHECKPOINT( #Algo " - Iterator" );\
+ BOOST_TEST_CHECKPOINT( #Algo " - Iterator" );\
/* Iterator test */\
string strout;\
Algo##_copy( back_inserter(strout), str1, Params );\
@@ -73,15 +74,15 @@
vector<char> vec1( str1.begin(), str1.end() );\
list<char> list1( str1.begin(), str1.end() );\
\
- BOOST_CHECKPOINT( #Algo " - Inplace(string)" );\
+ BOOST_TEST_CHECKPOINT( #Algo " - Inplace(string)" );\
Algo( str1, Params ); \
BOOST_CHECK( equals( str1, Output ) ); \
\
- BOOST_CHECKPOINT( #Algo " - Inplace(vector)" );\
+ BOOST_TEST_CHECKPOINT( #Algo " - Inplace(vector)" );\
Algo( vec1, Params ); \
BOOST_CHECK( equals( vec1, Output ) );\
\
- BOOST_CHECKPOINT( #Algo " - Inplace(list)" );\
+ BOOST_TEST_CHECKPOINT( #Algo " - Inplace(list)" );\
Algo( list1, Params ); \
BOOST_CHECK( equals( list1, Output ) );\
}
@@ -206,7 +207,7 @@
{
// replace_range
{
- BOOST_CHECKPOINT( "replace_range" );
+ BOOST_TEST_CHECKPOINT( "replace_range" );
string str1("1abc3abc2");
BOOST_CHECK(
@@ -231,7 +232,7 @@
}
// erase_range
{
- BOOST_CHECKPOINT( "erase_range" );
+ BOOST_TEST_CHECKPOINT( "erase_range" );
string str1("1abc3abc2");
BOOST_CHECK(
@@ -305,8 +306,7 @@
}
-// test main
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
sequence_traits_test();
replace_first_test();
@@ -318,6 +318,4 @@
replace_range_test();
collection_comp_test();
dissect_format_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/split_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/split_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/split_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -13,10 +13,12 @@
#include <boost/algorithm/string/predicate.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
+#include <list>
#include <iostream>
#include <boost/test/test_tools.hpp>
@@ -44,7 +46,7 @@
const char* pch1="xx-abc--xx-abb";
vector<string> tokens;
vector< vector<int> > vtokens;
-
+
// find_all tests
find_all(
tokens,
@@ -179,12 +181,15 @@
BOOST_CHECK(siter==split_iterator<string::iterator>(siter));
BOOST_CHECK(siter==split_iterator<string::iterator>());
+#if 0
+// Make sure we work with forward iterators
+// See bug #7989
+ list<char> l1;
+ find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx"));
+#endif
}
-// test main
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
iterator_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/string/test/trim_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/trim_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/trim_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,8 @@
#include <boost/algorithm/string/trim_all.hpp>
// Include unit test framework
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <iostream>
@@ -193,12 +194,9 @@
BOOST_CHECK( trim_fill_copy_if( string("<>abc<>def<>"), "-", is_any_of( "<<>>" ) )=="abc-def" );
}
-// test main
-int test_main( int, char*[] )
+BOOST_AUTO_TEST_CASE( test_main )
{
trim_test();
trim_all_test();
trim_fill_test();
-
- return 0;
}
Modified: branches/release/libs/algorithm/test/Jamfile.v2
==============================================================================
--- branches/release/libs/algorithm/test/Jamfile.v2 (original)
+++ branches/release/libs/algorithm/test/Jamfile.v2 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,44 +9,55 @@
import testing ;
+alias unit_test_framework
+ : # sources
+ /boost//unit_test_framework
+ ;
+
+
{
test-suite algorithm:
# Search tests
- : [ run empty_search_test.cpp : : : : empty_search_test ]
- [ run search_test1.cpp : : : : search_test1 ]
- [ run search_test2.cpp : : : : search_test2 ]
- [ run search_test3.cpp : : : : search_test3 ]
- [ run search_test4.cpp : : : : search_test4 ]
- [ compile-fail search_fail1.cpp : : : : ]
- [ compile-fail search_fail2.cpp : : : : ]
- [ compile-fail search_fail3.cpp : : : : ]
+ : [ run empty_search_test.cpp unit_test_framework : : : : empty_search_test ]
+ [ run search_test1.cpp unit_test_framework : : : : search_test1 ]
+ [ run search_test2.cpp unit_test_framework : : : : search_test2 ]
+ [ run search_test3.cpp unit_test_framework : : : : search_test3 ]
+ [ run search_test4.cpp unit_test_framework : : : : search_test4 ]
+ [ compile-fail search_fail1.cpp : : : : ]
+ [ compile-fail search_fail2.cpp : : : : ]
+ [ compile-fail search_fail3.cpp : : : : ]
# Clamp tests
- [ run clamp_test.cpp : : : : clamp_test ]
+ [ run clamp_test.cpp unit_test_framework : : : : clamp_test ]
# Cxx11 tests
- [ run all_of_test.cpp : : : : all_of_test ]
- [ run any_of_test.cpp : : : : any_of_test ]
- [ run none_of_test.cpp : : : : none_of_test ]
- [ run one_of_test.cpp : : : : one_of_test ]
+ [ run all_of_test.cpp unit_test_framework : : : : all_of_test ]
+ [ run any_of_test.cpp unit_test_framework : : : : any_of_test ]
+ [ run none_of_test.cpp unit_test_framework : : : : none_of_test ]
+ [ run one_of_test.cpp unit_test_framework : : : : one_of_test ]
- [ run ordered_test.cpp : : : : ordered_test ]
- [ run find_if_not_test1.cpp : : : : find_if_not_test1 ]
- [ run copy_if_test1.cpp : : : : copy_if_test1 ]
- [ run copy_n_test1.cpp : : : : copy_n_test1 ]
- [ run iota_test1.cpp : : : : iota_test1 ]
-
- [ run is_permutation_test1.cpp : : : : is_permutation_test1 ]
- [ run partition_point_test1.cpp : : : : partition_point_test1 ]
- [ run is_partitioned_test1.cpp : : : : is_partitioned_test1 ]
- [ run partition_copy_test1.cpp : : : : partition_copy_test1 ]
+ [ run ordered_test.cpp unit_test_framework : : : : ordered_test ]
+ [ run find_if_not_test1.cpp unit_test_framework : : : : find_if_not_test1 ]
+ [ run copy_if_test1.cpp unit_test_framework : : : : copy_if_test1 ]
+ [ run copy_n_test1.cpp unit_test_framework : : : : copy_n_test1 ]
+ [ run iota_test1.cpp unit_test_framework : : : : iota_test1 ]
+
+ [ run is_permutation_test1.cpp unit_test_framework : : : : is_permutation_test1 ]
+ [ run partition_point_test1.cpp unit_test_framework : : : : partition_point_test1 ]
+ [ run is_partitioned_test1.cpp unit_test_framework : : : : is_partitioned_test1 ]
+ [ run partition_copy_test1.cpp unit_test_framework : : : : partition_copy_test1 ]
# Hex tests
- [ run hex_test1.cpp : : : : hex_test1 ]
- [ run hex_test2.cpp : : : : hex_test2 ]
- [ run hex_test3.cpp : : : : hex_test3 ]
- [ run hex_test4.cpp : : : : hex_test4 ]
- [ compile-fail hex_fail1.cpp ]
+ [ run hex_test1.cpp unit_test_framework : : : : hex_test1 ]
+ [ run hex_test2.cpp unit_test_framework : : : : hex_test2 ]
+ [ run hex_test3.cpp unit_test_framework : : : : hex_test3 ]
+ [ run hex_test4.cpp unit_test_framework : : : : hex_test4 ]
+ [ compile-fail hex_fail1.cpp ]
+
+# Gather tests
+ [ run gather_test1.cpp unit_test_framework : : : : gather_test1 ]
+ [ compile-fail gather_fail1.cpp ]
+
;
}
Modified: branches/release/libs/algorithm/test/all_of_test.cpp
==============================================================================
--- branches/release/libs/algorithm/test/all_of_test.cpp (original)
+++ branches/release/libs/algorithm/test/all_of_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/all_of.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <functional>
#include <vector>
@@ -79,8 +81,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_all ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/any_of_test.cpp
==============================================================================
--- branches/release/libs/algorithm/test/any_of_test.cpp (original)
+++ branches/release/libs/algorithm/test/any_of_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/any_of.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <functional>
#include <vector>
@@ -98,8 +100,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_any ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/clamp_test.cpp
==============================================================================
--- branches/release/libs/algorithm/test/clamp_test.cpp (original)
+++ branches/release/libs/algorithm/test/clamp_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,8 @@
#include <boost/config.hpp>
#include <boost/algorithm/clamp.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
namespace ba = boost::algorithm;
@@ -205,7 +206,7 @@
BOOST_CHECK ( std::equal ( b_e(junk), outputs ));
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_ints ();
test_floats ();
@@ -214,5 +215,4 @@
test_int_range ();
// test_float_range ();
// test_custom_range ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/copy_if_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/copy_if_test1.cpp (original)
+++ branches/release/libs/algorithm/test/copy_if_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/copy_if.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <algorithm>
#include <string>
@@ -57,12 +59,12 @@
// Some of the elements
v.clear ();
ba::copy_if ( c.begin (), c.end (), back_inserter ( v ), is_even );
- BOOST_CHECK ( v.size () == std::count_if ( c.begin (), c.end (), is_even ));
+ BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even ));
BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even ));
v.clear ();
ba::copy_if ( c, back_inserter ( v ), is_even );
- BOOST_CHECK ( v.size () == std::count_if ( c.begin (), c.end (), is_even ));
+ BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even ));
BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even ));
}
@@ -80,8 +82,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_sequence1 ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/copy_n_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/copy_n_test1.cpp (original)
+++ branches/release/libs/algorithm/test/copy_n_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/copy_n.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <iostream>
@@ -78,8 +80,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_sequence1 ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/empty_search_test.cpp
==============================================================================
--- branches/release/libs/algorithm/test/empty_search_test.cpp (original)
+++ branches/release/libs/algorithm/test/empty_search_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -13,9 +13,10 @@
#include <boost/algorithm/searching/boyer_moore_horspool.hpp>
#include <boost/algorithm/searching/knuth_morris_pratt.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
-int test_main( int argc, char *argv [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
const std::string cs;
std::string estr;
@@ -77,7 +78,4 @@
str.begin (), str.end (), estr.begin (), estr.end ())
== str.begin ()
);
-
- (void) argv; (void) argc;
- return 0;
}
Modified: branches/release/libs/algorithm/test/find_if_not_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/find_if_not_test1.cpp (original)
+++ branches/release/libs/algorithm/test/find_if_not_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/find_if_not.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -83,8 +85,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_sequence1 ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/hex_fail1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/hex_fail1.cpp (original)
+++ branches/release/libs/algorithm/test/hex_fail1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,17 +9,17 @@
#include <boost/config.hpp>
#include <boost/algorithm/hex.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
#include <string>
#include <iostream>
#include <vector>
// should not compile: vector is not an integral type
-int test_main( int , char* [] )
+int main( int , char* [] )
{
std::vector<float> v;
std::string out;
boost::algorithm::unhex ( out, std::back_inserter(v));
+
return 0;
}
Modified: branches/release/libs/algorithm/test/hex_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/hex_test1.cpp (original)
+++ branches/release/libs/algorithm/test/hex_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/hex.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <iostream>
@@ -141,7 +143,7 @@
};
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_to_hex<std::string> ( tohex );
test_from_hex_success<std::string> ( fromhex );
@@ -150,5 +152,4 @@
test_to_hex<std::wstring> ( tohex_w );
test_from_hex_success<std::wstring> ( fromhex_w );
test_from_hex_failure<std::wstring> ( fromhex_fail_w );
- return 0;
}
Modified: branches/release/libs/algorithm/test/hex_test2.cpp
==============================================================================
--- branches/release/libs/algorithm/test/hex_test2.cpp (original)
+++ branches/release/libs/algorithm/test/hex_test2.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/hex.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <iostream>
@@ -129,9 +131,8 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_to_hex ();
test_from_hex_success ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/hex_test3.cpp
==============================================================================
--- branches/release/libs/algorithm/test/hex_test3.cpp (original)
+++ branches/release/libs/algorithm/test/hex_test3.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/hex.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <iostream>
@@ -113,11 +115,10 @@
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_to_hex ( tohex );
test_to_hex ( tohex_w );
test_from_hex_success ( fromhex );
test_from_hex_success ( fromhex_w );
- return 0;
}
Modified: branches/release/libs/algorithm/test/hex_test4.cpp
==============================================================================
--- branches/release/libs/algorithm/test/hex_test4.cpp (original)
+++ branches/release/libs/algorithm/test/hex_test4.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/hex.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <iostream>
@@ -136,10 +138,8 @@
test_nonhex_input4 ();
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_short_input ();
test_nonhex_input ();
-
- return 0;
}
Modified: branches/release/libs/algorithm/test/iota_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/iota_test1.cpp (original)
+++ branches/release/libs/algorithm/test/iota_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/iota.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <iostream>
#include <string>
@@ -72,8 +74,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_ints ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/is_partitioned_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/is_partitioned_test1.cpp (original)
+++ branches/release/libs/algorithm/test/is_partitioned_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/is_partitioned.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -56,8 +58,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_sequence1 ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/is_permutation_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/is_permutation_test1.cpp (original)
+++ branches/release/libs/algorithm/test/is_permutation_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/is_permutation.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -42,8 +44,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_sequence1 ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/none_of_test.cpp
==============================================================================
--- branches/release/libs/algorithm/test/none_of_test.cpp (original)
+++ branches/release/libs/algorithm/test/none_of_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/none_of.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <functional>
#include <vector>
@@ -89,8 +91,7 @@
BOOST_CHECK (!ba::none_of ( li.begin(), l_iter, is_<int> ( 5 )));
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_none();
- return 0;
}
Modified: branches/release/libs/algorithm/test/one_of_test.cpp
==============================================================================
--- branches/release/libs/algorithm/test/one_of_test.cpp (original)
+++ branches/release/libs/algorithm/test/one_of_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,7 +9,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/one_of.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <functional>
#include <vector>
@@ -94,8 +96,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_one ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/ordered_test.cpp
==============================================================================
--- branches/release/libs/algorithm/test/ordered_test.cpp (original)
+++ branches/release/libs/algorithm/test/ordered_test.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -13,7 +13,9 @@
#include <iostream>
#include <boost/algorithm/cxx11/is_sorted.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
using namespace boost;
@@ -146,9 +148,8 @@
}
-int test_main( int, char * [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_ordered ();
test_increasing_decreasing ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/partition_copy_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/partition_copy_test1.cpp (original)
+++ branches/release/libs/algorithm/test/partition_copy_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/partition_copy.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <boost/algorithm/cxx11/all_of.hpp>
#include <boost/algorithm/cxx11/none_of.hpp>
@@ -80,8 +82,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_sequence1 ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/partition_point_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/partition_point_test1.cpp (original)
+++ branches/release/libs/algorithm/test/partition_point_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,9 @@
#include <boost/config.hpp>
#include <boost/algorithm/cxx11/partition_point.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <string>
#include <vector>
@@ -91,8 +93,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
test_sequence1 ();
- return 0;
}
Modified: branches/release/libs/algorithm/test/search_fail1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/search_fail1.cpp (original)
+++ branches/release/libs/algorithm/test/search_fail1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -10,7 +10,7 @@
#include <vector>
#include <boost/algorithm/searching/boyer_moore.hpp>
-int main( int argc, char *argv [] )
+int main( int , char* [] )
{
std::vector<char> cv;
std::vector<int> iv;
@@ -20,7 +20,5 @@
(void) boost::algorithm::boyer_moore_search (
cv.begin (), cv.end (), iv.begin (), iv.end ());
-
- (void) argv; (void) argc;
return 0;
}
Modified: branches/release/libs/algorithm/test/search_fail2.cpp
==============================================================================
--- branches/release/libs/algorithm/test/search_fail2.cpp (original)
+++ branches/release/libs/algorithm/test/search_fail2.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,7 @@
#include <boost/cstdint.hpp>
#include <boost/algorithm/searching/boyer_moore.hpp>
-int main( int argc, char *argv [] )
+int main( int , char* [] )
{
std::vector<boost::uint8_t> cv;
std::vector<boost:: int8_t> iv;
@@ -21,7 +21,5 @@
(void) boost::algorithm::boyer_moore_search (
cv.begin (), cv.end (), iv.begin (), iv.end ());
-
- (void) argv; (void) argc;
return 0;
}
Modified: branches/release/libs/algorithm/test/search_fail3.cpp
==============================================================================
--- branches/release/libs/algorithm/test/search_fail3.cpp (original)
+++ branches/release/libs/algorithm/test/search_fail3.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -10,11 +10,10 @@
#include <vector>
#include <boost/algorithm/searching/boyer_moore.hpp>
-int main( int argc, char *argv [] )
+int main( int , char* [] )
{
// Should fail to compile because the search objects are not default-constructible
boost::algorithm::boyer_moore<std::vector<char>::iterator> bm;
- (void) argv; (void) argc;
return 0;
}
Modified: branches/release/libs/algorithm/test/search_test1.cpp
==============================================================================
--- branches/release/libs/algorithm/test/search_test1.cpp (original)
+++ branches/release/libs/algorithm/test/search_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,7 +11,8 @@
#include <boost/algorithm/searching/boyer_moore_horspool.hpp>
#include <boost/algorithm/searching/knuth_morris_pratt.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <iostream>
#include <string>
@@ -218,7 +219,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
std::string haystack1 ( "NOW AN FOWE\220ER ANNMAN THE ANPANMANEND" );
std::string needle1 ( "ANPANMAN" );
@@ -268,5 +269,4 @@
const std::string mikhail_corpus = std::string (8, 'a') + mikhail_pattern;
check_one ( mikhail_corpus, mikhail_pattern, 8 );
- return 0;
}
Modified: branches/release/libs/algorithm/test/search_test2.cpp
==============================================================================
--- branches/release/libs/algorithm/test/search_test2.cpp (original)
+++ branches/release/libs/algorithm/test/search_test2.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,9 +11,12 @@
#include <boost/algorithm/searching/boyer_moore_horspool.hpp>
#include <boost/algorithm/searching/knuth_morris_pratt.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <iostream>
+#include <fstream>
+#include <iomanip>
#include <algorithm>
#include <vector>
@@ -122,7 +125,7 @@
}
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
vec c1 = ReadFromFile ( "search_test_data/0001.corpus" );
vec p1b = ReadFromFile ( "search_test_data/0001b.pat" );
@@ -140,6 +143,4 @@
check_one ( c1, p1e, c1.size() - p1e.size ());
std::cout << "--- Not found ---" << std::endl;
check_one ( c1, p1n, -1 ); // Not found
-
- return 0;
}
Modified: branches/release/libs/algorithm/test/search_test3.cpp
==============================================================================
--- branches/release/libs/algorithm/test/search_test3.cpp (original)
+++ branches/release/libs/algorithm/test/search_test3.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,9 +11,12 @@
#include <boost/algorithm/searching/boyer_moore_horspool.hpp>
#include <boost/algorithm/searching/knuth_morris_pratt.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <iostream>
+#include <fstream>
+#include <iomanip>
#include <algorithm>
#include <vector>
#include <string>
@@ -122,7 +125,7 @@
}
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
vec c1 = ReadFromFile ( "search_test_data/0001.corpus" );
vec p1b = ReadFromFile ( "search_test_data/0002b.pat" );
@@ -140,6 +143,4 @@
check_one ( c1, p1e, c1.size() - p1e.size ());
std::cout << "--- Not found ---" << std::endl;
check_one ( c1, p1n, -1 ); // Not found
-
- return 0;
}
Modified: branches/release/libs/algorithm/test/search_test4.cpp
==============================================================================
--- branches/release/libs/algorithm/test/search_test4.cpp (original)
+++ branches/release/libs/algorithm/test/search_test4.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -13,9 +13,12 @@
#include <boost/algorithm/searching/boyer_moore_horspool.hpp>
#include <boost/algorithm/searching/knuth_morris_pratt.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
#include <iostream>
+#include <fstream>
+#include <iomanip>
#include <algorithm>
#include <vector>
#include <string>
@@ -93,7 +96,7 @@
}
-int test_main( int , char* [] )
+BOOST_AUTO_TEST_CASE( test_main )
{
vec c1 = ReadFromFile ( "search_test_data/0001.corpus" );
vec p1b = ReadFromFile ( "search_test_data/0002b.pat" );
@@ -111,6 +114,4 @@
check_one ( c1, p1e, c1.size() - p1e.size ());
std::cout << "--- Not found ---" << std::endl;
check_one ( c1, p1n, -1 ); // Not found
-
- return 0;
}
Modified: branches/release/libs/array/test/Jamfile.v2
==============================================================================
--- branches/release/libs/array/test/Jamfile.v2 (original)
+++ branches/release/libs/array/test/Jamfile.v2 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -4,13 +4,18 @@
import testing ;
+alias unit_test_framework
+ : # sources
+ /boost//unit_test_framework
+ ;
+
test-suite array :
- [ run array0.cpp ]
+ [ run array0.cpp unit_test_framework : : : : array0 ]
[ run array1.cpp ]
[ run array2.cpp ]
[ run array3.cpp ]
[ run array4.cpp ]
[ run array5.cpp ]
- [ run array6.cpp ]
- [ run array_hash.cpp ]
+ [ run array6.cpp unit_test_framework : : : : array6 ]
+ [ run array_hash.cpp unit_test_framework : : : : array_hash ]
;
Modified: branches/release/libs/array/test/array0.cpp
==============================================================================
--- branches/release/libs/array/test/array0.cpp (original)
+++ branches/release/libs/array/test/array0.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -9,18 +9,15 @@
#include <iostream>
#include <boost/array.hpp>
-namespace {
-unsigned int failed_tests = 0;
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
-void fail_test( const char * reason ) {
- ++failed_tests;
- std::cerr << "Test failure " << failed_tests << ": " << reason << std::endl;
-}
+namespace {
template< class T >
void BadValue( const T & )
{
- fail_test( "Unexpected value" );
+ BOOST_CHECK ( false );
}
template< class T >
@@ -36,46 +33,24 @@
// front/back and operator[] must compile, but calling them is undefined
// Likewise, all tests below should evaluate to false, avoiding undefined behaviour
- if( !test_case.empty() ) {
- BadValue( test_case.front() );
- }
-
- if( !const_test_case.empty() ) {
- BadValue( const_test_case.back() );
- }
-
- if( test_case.size() > 0 ) {
- BadValue( test_case[ 0 ] );
- }
+ BOOST_CHECK ( test_case.empty());
+ BOOST_CHECK ( const_test_case.empty());
- if( const_test_case.max_size() > 0 ) {
- BadValue( const_test_case[ 0 ] );
- }
+ BOOST_CHECK ( test_case.size() == 0 );
+ BOOST_CHECK ( const_test_case.size() == 0 );
// Assert requirements of TR1 6.2.2.4
- if( test_case.begin() != test_case.end() ) {
- fail_test( "Not an empty range" );
- }
- if( test_case.cbegin() != test_case.cend() ) {
- fail_test( "Not an empty range" );
- }
- if( const_test_case.begin() != const_test_case.end() ) {
- fail_test( "Not an empty range" );
- }
- if( const_test_case.cbegin() != const_test_case.cend() ) {
- fail_test( "Not an empty range" );
- }
-
- if( test_case.begin() == const_test_case.begin() ) {
- fail_test( "iterators for different containers are not distinct" );
- }
+ BOOST_CHECK ( test_case.begin() == test_case.end());
+ BOOST_CHECK ( test_case.cbegin() == test_case.cend());
+ BOOST_CHECK ( const_test_case.begin() == const_test_case.end());
+ BOOST_CHECK ( const_test_case.cbegin() == const_test_case.cend());
+ BOOST_CHECK ( test_case.begin() != const_test_case.begin() );
if( test_case.data() == const_test_case.data() ) {
// Value of data is unspecified in TR1, so no requirement this test pass or fail
// However, it must compile!
}
-
// Check can safely use all iterator types with std algorithms
std::for_each( test_case.begin(), test_case.end(), BadValue< T > );
std::for_each( test_case.rbegin(), test_case.rend(), BadValue< T > );
@@ -87,12 +62,12 @@
// Check swap is well formed
std::swap( test_case, test_case );
- // Check assigment operator and overloads are well formed
+ // Check assignment operator and overloads are well formed
test_case = const_test_case;
// Confirm at() throws the std lib defined exception
try {
- BadValue( test_case.at( 0 ) );
+ BadValue( test_case.at( 0 ));
} catch ( const std::out_of_range & ) {
}
@@ -104,12 +79,11 @@
}
-int main()
+BOOST_AUTO_TEST_CASE( test_main )
{
RunTests< bool >();
RunTests< void * >();
RunTests< long double >();
RunTests< std::string >();
- return failed_tests;
}
Modified: branches/release/libs/array/test/array6.cpp
==============================================================================
--- branches/release/libs/array/test/array6.cpp (original)
+++ branches/release/libs/array/test/array6.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -10,39 +10,31 @@
#include <boost/array.hpp>
#include <algorithm>
-namespace {
-unsigned int failed_tests = 0;
-
-void fail_test( const char * reason ) {
- ++failed_tests;
- std::cerr << "Test failure " << failed_tests << ": " << reason << std::endl;
-}
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
-template< class T >
-void RunTests()
-{
- typedef boost::array< T, 5 > test_type;
- typedef T arr[5];
- test_type test_case; // = { 1, 1, 2, 3, 5 };
+namespace {
+ template< class T >
+ void RunTests()
+ {
+ typedef boost::array< T, 5 > test_type;
+ typedef T arr[5];
+ test_type test_case; // = { 1, 1, 2, 3, 5 };
- arr &aRef = get_c_array ( test_case );
- if ( &*test_case.begin () != &aRef[0] )
- fail_test ( "Array6: Same thing not equal?(1)" );
+ arr &aRef = get_c_array ( test_case );
+ BOOST_CHECK ( &*test_case.begin () == &aRef[0] );
- const arr &caRef = get_c_array ( test_case );
- typename test_type::const_iterator iter = test_case.begin ();
- if ( &*iter != &caRef[0] )
- fail_test ( "Array6: Same thing not equal?(2)" );
-}
-
+ const arr &caRef = get_c_array ( test_case );
+ typename test_type::const_iterator iter = test_case.begin ();
+ BOOST_CHECK ( &*iter == &caRef[0] );
+ }
}
-int main()
+BOOST_AUTO_TEST_CASE( test_main )
{
RunTests< bool >();
RunTests< void * >();
RunTests< long double >();
RunTests< std::string >();
- return failed_tests;
}
Modified: branches/release/libs/array/test/array_hash.cpp
==============================================================================
--- branches/release/libs/array/test/array_hash.cpp (original)
+++ branches/release/libs/array/test/array_hash.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -11,39 +11,33 @@
#include <algorithm>
#include <boost/functional/hash.hpp>
-namespace {
-unsigned int failed_tests = 0;
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
-void fail_test( const char * reason ) {
- ++failed_tests;
- std::cerr << "Test failure " << failed_tests << ": " << reason << std::endl;
-}
+namespace {
-template< class T >
-void RunTests()
-{
-// std::size_t hash0 = boost::hash<boost::array<T,0> > () ( boost::array<T, 0> ());
-// std::size_t hash1 = boost::hash<boost::array<T,1> > () ( boost::array<T, 1> ());
+ template< class T >
+ void RunTests()
+ {
+ // std::size_t hash0 = boost::hash<boost::array<T,0> > () ( boost::array<T, 0> ());
+ // std::size_t hash1 = boost::hash<boost::array<T,1> > () ( boost::array<T, 1> ());
- typedef boost::array< T, 5 > barr;
- typedef T arr[5];
- barr test_barr = {{ 1, 1, 2, 3, 5 }};
- arr test_arr = { 1, 1, 2, 3, 5 };
+ typedef boost::array< T, 5 > barr;
+ typedef T arr[5];
+ barr test_barr = {{ 1, 1, 2, 3, 5 }};
+ arr test_arr = { 1, 1, 2, 3, 5 };
- std::size_t bhash = boost::hash<barr> () ( test_barr );
- std::size_t ahash = boost::hash<arr> () ( test_arr );
- if ( ahash != bhash )
- fail_test ( "Array_hash: Hash-mismatch on " );
-}
+ std::size_t bhash = boost::hash<barr> () ( test_barr );
+ std::size_t ahash = boost::hash<arr> () ( test_arr );
+ BOOST_CHECK ( ahash == bhash );
+ }
}
-int main()
+BOOST_AUTO_TEST_CASE( test_main )
{
RunTests< int >();
RunTests< long >();
RunTests< long double >();
-
- return failed_tests;
}
Modified: branches/release/libs/utility/test/Jamfile.v2
==============================================================================
--- branches/release/libs/utility/test/Jamfile.v2 (original)
+++ branches/release/libs/utility/test/Jamfile.v2 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -8,6 +8,11 @@
# bring in rules for testing
import testing ;
+alias unit_test_framework
+ : # sources
+ /boost//unit_test_framework
+ ;
+
# Please keep the tests ordered by filename
test-suite utility
:
@@ -31,8 +36,8 @@
[ run ../ref_test.cpp ../../test/build//boost_test_exec_monitor/<link>static ]
[ compile result_of_test.cpp ]
[ run ../shared_iterator_test.cpp ]
- [ run string_ref_test1.cpp ]
- [ run string_ref_test2.cpp ]
+ [ run string_ref_test1.cpp unit_test_framework ]
+ [ run string_ref_test2.cpp unit_test_framework ]
[ run ../value_init_test.cpp ]
[ run ../value_init_workaround_test.cpp ]
[ run ../initialized_test.cpp ]
Modified: branches/release/libs/utility/test/string_ref_test1.cpp
==============================================================================
--- branches/release/libs/utility/test/string_ref_test1.cpp (original)
+++ branches/release/libs/utility/test/string_ref_test1.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -13,8 +13,8 @@
#include <boost/utility/string_ref.hpp>
-
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
typedef boost::string_ref string_ref;
@@ -94,8 +94,8 @@
NULL
};
-int test_main( int , char* [] ) {
-
+BOOST_AUTO_TEST_CASE( test_main )
+{
const char **p = &test_strings[0];
while ( *p != NULL ) {
@@ -106,6 +106,4 @@
p++;
}
-
- return 0;
- }
+}
Modified: branches/release/libs/utility/test/string_ref_test2.cpp
==============================================================================
--- branches/release/libs/utility/test/string_ref_test2.cpp (original)
+++ branches/release/libs/utility/test/string_ref_test2.cpp 2013-02-25 13:43:26 EST (Mon, 25 Feb 2013)
@@ -12,7 +12,8 @@
#include <boost/utility/string_ref.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
typedef boost::string_ref string_ref;
@@ -240,7 +241,8 @@
NULL
};
-int test_main( int , char* [] ) {
+BOOST_AUTO_TEST_CASE( test_main )
+{
const char **p = &test_strings[0];
while ( *p != NULL ) {
@@ -251,6 +253,4 @@
p++;
}
-
- return 0;
- }
+}