updated boost on windows
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <boost/test/tree/decorator.hpp>
|
||||
#include <boost/test/tree/fixture.hpp>
|
||||
#include <boost/test/framework.hpp>
|
||||
|
||||
#include <boost/test/tools/assertion_result.hpp>
|
||||
|
||||
@@ -42,7 +43,7 @@ namespace boost {
|
||||
namespace unit_test {
|
||||
|
||||
namespace framework {
|
||||
class state;
|
||||
class state;
|
||||
}
|
||||
|
||||
// ************************************************************************** //
|
||||
@@ -175,11 +176,21 @@ public:
|
||||
void add( test_unit_generator const& gen, unsigned timeout = 0 );
|
||||
|
||||
/// @overload
|
||||
void add( test_unit_generator const& gen, decorator::collector& decorators );
|
||||
void add( test_unit_generator const& gen, decorator::collector_t& decorators );
|
||||
|
||||
/// @overload
|
||||
void add( boost::shared_ptr<test_unit_generator> gen_ptr, decorator::collector_t& decorators );
|
||||
|
||||
//! Removes a test from the test suite.
|
||||
void remove( test_unit_id id );
|
||||
|
||||
//! Generates all the delayed test_units from the generators
|
||||
void generate( );
|
||||
|
||||
//! Check for duplicates name in test cases
|
||||
//!
|
||||
//! Raises a setup_error if there are duplicates
|
||||
void check_for_duplicate_test_cases();
|
||||
|
||||
// access methods
|
||||
test_unit_id get( const_string tu_name ) const;
|
||||
@@ -199,6 +210,8 @@ protected:
|
||||
|
||||
test_unit_id_list m_children;
|
||||
children_per_rank m_ranked_children; ///< maps child sibling rank to list of children with that rank
|
||||
|
||||
std::vector< std::pair<boost::shared_ptr<test_unit_generator>, std::vector<decorator::base_ptr> > > m_generators; /// lazy evaluation
|
||||
};
|
||||
|
||||
// ************************************************************************** //
|
||||
@@ -206,12 +219,17 @@ protected:
|
||||
// ************************************************************************** //
|
||||
|
||||
class BOOST_TEST_DECL master_test_suite_t : public test_suite {
|
||||
public:
|
||||
private:
|
||||
master_test_suite_t();
|
||||
|
||||
master_test_suite_t(const master_test_suite_t&); // undefined
|
||||
master_test_suite_t& operator=(master_test_suite_t const &); // undefined
|
||||
|
||||
public:
|
||||
// Data members
|
||||
int argc;
|
||||
char** argv;
|
||||
|
||||
friend BOOST_TEST_DECL master_test_suite_t& boost::unit_test::framework::master_test_suite();
|
||||
};
|
||||
|
||||
// ************************************************************************** //
|
||||
|
||||
Reference in New Issue
Block a user