diff options
author | 2017-02-05 15:45:26 +0100 | |
---|---|---|
committer | 2017-02-05 15:46:07 +0100 | |
commit | 02c97cd0f7c4d630f1a90f9f2626746e47a28c09 (patch) | |
tree | 2b48d051a55f2b65525824546cd9fcf9e05907cf /3rdparty/catch/projects/SelfTest/ToStringWhich.cpp | |
parent | d20b4ba6864b45d0c068d98d43e63c8bc5014a3b (diff) |
Updated Catch to latest (nw)
Diffstat (limited to '3rdparty/catch/projects/SelfTest/ToStringWhich.cpp')
-rw-r--r-- | 3rdparty/catch/projects/SelfTest/ToStringWhich.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/3rdparty/catch/projects/SelfTest/ToStringWhich.cpp b/3rdparty/catch/projects/SelfTest/ToStringWhich.cpp index 1d4aa892581..a1d2a60953f 100644 --- a/3rdparty/catch/projects/SelfTest/ToStringWhich.cpp +++ b/3rdparty/catch/projects/SelfTest/ToStringWhich.cpp @@ -37,19 +37,21 @@ TEST_CASE( "toString( has_toString )", "[toString]" ) { } // Call the overload -TEST_CASE( "toString( has_maker )", "[toString]" ) { +TEST_CASE( "toString( has_maker )", "toString]" ) { has_maker item; REQUIRE( Catch::toString( item ) == "StringMaker<has_maker>" ); } // Call the overload -TEST_CASE( "toString( has_maker_and_toString )", "[toString]" ) { +TEST_CASE( "toString( has_maker_and_toString )", "[.][toString]" ) { has_maker_and_toString item; REQUIRE( Catch::toString( item ) == "toString( has_maker_and_toString )" ); } // Vectors... -TEST_CASE( "toString( vectors<has_toString )", "[toString]" ) { + +// Don't run this in approval tests as it is sensitive to two phase lookup differences +TEST_CASE( "toString( vectors<has_toString )", "[.][toString][!nonportable]" ) { std::vector<has_toString> v(1); // This invokes template<T> toString which actually gives us '{ ? }' REQUIRE( Catch::toString( v ) == "{ {?} }" ); @@ -61,7 +63,8 @@ TEST_CASE( "toString( vectors<has_maker )", "[toString]" ) { } -TEST_CASE( "toString( vectors<has_maker_and_toString )", "[toString]" ) { +// Don't run this in approval tests as it is sensitive to two phase lookup differences +TEST_CASE( "toString( vectors<has_maker_and_toString )", "[.][toString][!nonportable]" ) { std::vector<has_maker_and_toString> v(1); // Note: This invokes the template<T> toString -> StringMaker REQUIRE( Catch::toString( v ) == "{ StringMaker<has_maker_and_toString> }" ); |