From 1ae84897d4bd691420b0b8eb17b92cb62afbaf58 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 9 Jan 2017 14:26:59 +0000 Subject: [PATCH] Marked tests that use C++11 features with [c++11] tag and exclude them from approval tests --- .../Baselines/console.std.approved.txt | 4 +- .../Baselines/console.sw.approved.txt | 164 +----------------- .../SelfTest/Baselines/junit.sw.approved.txt | 12 +- .../SelfTest/Baselines/xml.sw.approved.txt | 164 +----------------- projects/SelfTest/EnumToString.cpp | 4 +- projects/SelfTest/MiscTests.cpp | 2 +- projects/SelfTest/ToStringTuple.cpp | 12 +- projects/SelfTest/TrickyTests.cpp | 2 +- scripts/approvalTests.py | 10 +- 9 files changed, 22 insertions(+), 352 deletions(-) diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 7c5da08c..07190b90 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -830,6 +830,6 @@ with expansion: "first" == "second" =============================================================================== -test cases: 169 | 125 passed | 42 failed | 2 failed as expected -assertions: 921 | 825 passed | 78 failed | 18 failed as expected +test cases: 159 | 115 passed | 42 failed | 2 failed as expected +assertions: 906 | 810 passed | 78 failed | 18 failed as expected diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 6c982790..e09aea9e 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -8060,20 +8060,6 @@ MessageTests.cpp:: FAILED: explicitly with message: Previous info should not be seen -------------------------------------------------------------------------------- -long long -------------------------------------------------------------------------------- -MiscTests.cpp: -............................................................................... - -MiscTests.cpp:: -PASSED: - REQUIRE( l == std::numeric_limits::max() ) -with expansion: - 9223372036854775807 (0x) - == - 9223372036854775807 (0x) - ------------------------------------------------------------------------------- looped SECTION tests s1 @@ -8263,18 +8249,6 @@ PASSED: with expansion: {null string} == {null string} -------------------------------------------------------------------------------- -null_ptr -------------------------------------------------------------------------------- -TrickyTests.cpp: -............................................................................... - -TrickyTests.cpp:: -PASSED: - REQUIRE( ptr.get() == 0 ) -with expansion: - NULL == 0 - ------------------------------------------------------------------------------- pair > -> toString ------------------------------------------------------------------------------- @@ -8668,50 +8642,6 @@ PASSED: with expansion: "{ {?} }" == "{ {?} }" -------------------------------------------------------------------------------- -toString(enum class w/operator<<) -------------------------------------------------------------------------------- -EnumToString.cpp: -............................................................................... - -EnumToString.cpp:: -PASSED: - CHECK( Catch::toString(e0) == "E2/V0" ) -with expansion: - "E2/V0" == "E2/V0" - -EnumToString.cpp:: -PASSED: - CHECK( Catch::toString(e1) == "E2/V1" ) -with expansion: - "E2/V1" == "E2/V1" - -EnumToString.cpp:: -PASSED: - CHECK( Catch::toString(e3) == "Unknown enum value 10" ) -with expansion: - "Unknown enum value 10" - == - "Unknown enum value 10" - -------------------------------------------------------------------------------- -toString(enum class) -------------------------------------------------------------------------------- -EnumToString.cpp: -............................................................................... - -EnumToString.cpp:: -PASSED: - CHECK( Catch::toString(e0) == "0" ) -with expansion: - "0" == "0" - -EnumToString.cpp:: -PASSED: - CHECK( Catch::toString(e1) == "1" ) -with expansion: - "1" == "1" - ------------------------------------------------------------------------------- toString(enum w/operator<<) ------------------------------------------------------------------------------- @@ -8748,96 +8678,6 @@ PASSED: with expansion: "1" == "1" -------------------------------------------------------------------------------- -tuple<> -------------------------------------------------------------------------------- -ToStringTuple.cpp: -............................................................................... - -ToStringTuple.cpp:: -PASSED: - CHECK( "{ }" == Catch::toString(type{}) ) -with expansion: - "{ }" == "{ }" - -ToStringTuple.cpp:: -PASSED: - CHECK( "{ }" == Catch::toString(value) ) -with expansion: - "{ }" == "{ }" - -------------------------------------------------------------------------------- -tuple -------------------------------------------------------------------------------- -ToStringTuple.cpp: -............................................................................... - -ToStringTuple.cpp:: -PASSED: - CHECK( "1.2f" == Catch::toString(float(1.2)) ) -with expansion: - "1.2f" == "1.2f" - -ToStringTuple.cpp:: -PASSED: - CHECK( "{ 1.2f, 0 }" == Catch::toString(type{1.2,0}) ) -with expansion: - "{ 1.2f, 0 }" == "{ 1.2f, 0 }" - -------------------------------------------------------------------------------- -tuple -------------------------------------------------------------------------------- -ToStringTuple.cpp: -............................................................................... - -ToStringTuple.cpp:: -PASSED: - CHECK( "{ 0 }" == Catch::toString(type{0}) ) -with expansion: - "{ 0 }" == "{ 0 }" - -------------------------------------------------------------------------------- -tuple<0,int,const char *> -------------------------------------------------------------------------------- -ToStringTuple.cpp: -............................................................................... - -ToStringTuple.cpp:: -PASSED: - CHECK( "{ 0, 42, \"Catch me\" }" == Catch::toString(value) ) -with expansion: - "{ 0, 42, "Catch me" }" - == - "{ 0, 42, "Catch me" }" - -------------------------------------------------------------------------------- -tuple -------------------------------------------------------------------------------- -ToStringTuple.cpp: -............................................................................... - -ToStringTuple.cpp:: -PASSED: - CHECK( "{ \"hello\", \"world\" }" == Catch::toString(type{"hello","world"}) ) -with expansion: - "{ "hello", "world" }" - == - "{ "hello", "world" }" - -------------------------------------------------------------------------------- -tuple,tuple<>,float> -------------------------------------------------------------------------------- -ToStringTuple.cpp: -............................................................................... - -ToStringTuple.cpp:: -PASSED: - CHECK( "{ { 42 }, { }, 1.2f }" == Catch::toString(value) ) -with expansion: - "{ { 42 }, { }, 1.2f }" - == - "{ { 42 }, { }, 1.2f }" - ------------------------------------------------------------------------------- vec> -> toString ------------------------------------------------------------------------------- @@ -9115,6 +8955,6 @@ MiscTests.cpp:: PASSED: =============================================================================== -test cases: 169 | 124 passed | 43 failed | 2 failed as expected -assertions: 923 | 825 passed | 80 failed | 18 failed as expected +test cases: 159 | 114 passed | 43 failed | 2 failed as expected +assertions: 908 | 810 passed | 80 failed | 18 failed as expected diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 490c810e..91732929 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,6 +1,6 @@ - + @@ -567,7 +567,6 @@ Previous info should not be seen MessageTests.cpp: - MiscTests.cpp: @@ -611,7 +610,6 @@ MiscTests.cpp: - @@ -654,16 +652,8 @@ TrickyTests.cpp: - - - - - - - - diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index b031e4d9..6d9d7355 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -8502,19 +8502,6 @@ there" - - - - l == std::numeric_limits<long long>::max() - - - 9223372036854775807 (0x) -== -9223372036854775807 (0x) - - - -
@@ -8725,17 +8712,6 @@ there" - - - - ptr.get() == 0 - - - NULL == 0 - - - - @@ -9129,54 +9105,6 @@ there" - - - - Catch::toString(e0) == "E2/V0" - - - "E2/V0" == "E2/V0" - - - - - Catch::toString(e1) == "E2/V1" - - - "E2/V1" == "E2/V1" - - - - - Catch::toString(e3) == "Unknown enum value 10" - - - "Unknown enum value 10" -== -"Unknown enum value 10" - - - - - - - - Catch::toString(e0) == "0" - - - "0" == "0" - - - - - Catch::toString(e1) == "1" - - - "1" == "1" - - - - @@ -9215,94 +9143,6 @@ there" - - - - "{ }" == Catch::toString(type{}) - - - "{ }" == "{ }" - - - - - "{ }" == Catch::toString(value) - - - "{ }" == "{ }" - - - - - - - - "1.2f" == Catch::toString(float(1.2)) - - - "1.2f" == "1.2f" - - - - - "{ 1.2f, 0 }" == Catch::toString(type{1.2,0}) - - - "{ 1.2f, 0 }" == "{ 1.2f, 0 }" - - - - - - - - "{ 0 }" == Catch::toString(type{0}) - - - "{ 0 }" == "{ 0 }" - - - - - - - - "{ 0, 42, \"Catch me\" }" == Catch::toString(value) - - - "{ 0, 42, "Catch me" }" -== -"{ 0, 42, "Catch me" }" - - - - - - - - "{ \"hello\", \"world\" }" == Catch::toString(type{"hello","world"}) - - - "{ "hello", "world" }" -== -"{ "hello", "world" }" - - - - - - - - "{ { 42 }, { }, 1.2f }" == Catch::toString(value) - - - "{ { 42 }, { }, 1.2f }" -== -"{ { 42 }, { }, 1.2f }" - - - - @@ -9570,7 +9410,7 @@ there"
- + - + diff --git a/projects/SelfTest/EnumToString.cpp b/projects/SelfTest/EnumToString.cpp index 6917d8ae..f591520f 100644 --- a/projects/SelfTest/EnumToString.cpp +++ b/projects/SelfTest/EnumToString.cpp @@ -38,7 +38,7 @@ TEST_CASE( "toString(enum w/operator<<)", "[toString][enum]" ) { // Enum class without user-provided stream operator enum class EnumClass1 { EnumClass1Value0, EnumClass1Value1 }; -TEST_CASE( "toString(enum class)", "[toString][enum][enumClass]" ) { +TEST_CASE( "toString(enum class)", "[toString][enum][enumClass][c++11][.]" ) { EnumClass1 e0 = EnumClass1::EnumClass1Value0; CHECK( Catch::toString(e0) == "0" ); EnumClass1 e1 = EnumClass1::EnumClass1Value1; @@ -59,7 +59,7 @@ inline std::ostream& operator<<( std::ostream& os, EnumClass2 e2 ) { } } -TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass]" ) { +TEST_CASE( "toString(enum class w/operator<<)", "[toString][enum][enumClass][c++11][.]" ) { EnumClass2 e0 = EnumClass2::EnumClass2Value0; CHECK( Catch::toString(e0) == "E2/V0" ); EnumClass2 e1 = EnumClass2::EnumClass2Value1; diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp index b440b412..5de2ca48 100644 --- a/projects/SelfTest/MiscTests.cpp +++ b/projects/SelfTest/MiscTests.cpp @@ -466,7 +466,7 @@ TEST_CASE( "XmlEncode" ) { } #ifdef CATCH_CONFIG_CPP11_LONG_LONG -TEST_CASE( "long long" ) { +TEST_CASE( "long long", "[c++11][.]" ) { long long l = std::numeric_limits::max(); REQUIRE( l == std::numeric_limits::max() ); diff --git a/projects/SelfTest/ToStringTuple.cpp b/projects/SelfTest/ToStringTuple.cpp index 80e54530..fa61f631 100644 --- a/projects/SelfTest/ToStringTuple.cpp +++ b/projects/SelfTest/ToStringTuple.cpp @@ -7,7 +7,7 @@ #pragma clang diagnostic ignored "-Wc++98-compat" #endif -TEST_CASE( "tuple<>", "[toString][tuple]" ) +TEST_CASE( "tuple<>", "[toString][tuple][c++11][.]" ) { typedef std::tuple<> type; CHECK( "{ }" == Catch::toString(type{}) ); @@ -15,27 +15,27 @@ TEST_CASE( "tuple<>", "[toString][tuple]" ) CHECK( "{ }" == Catch::toString(value) ); } -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; CHECK( "{ 0 }" == Catch::toString(type{0}) ); } -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; CHECK( "1.2f" == Catch::toString(float(1.2)) ); CHECK( "{ 1.2f, 0 }" == Catch::toString(type{1.2,0}) ); } -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; CHECK( "{ \"hello\", \"world\" }" == Catch::toString(type{"hello","world"}) ); } -TEST_CASE( "tuple,tuple<>,float>", "[toString][tuple]" ) +TEST_CASE( "tuple,tuple<>,float>", "[toString][tuple][c++11][.]" ) { typedef std::tuple,std::tuple<>,float> type; type value { std::tuple{42}, {}, 1.2f }; @@ -43,7 +43,7 @@ TEST_CASE( "tuple,tuple<>,float>", "[toString][tuple]" ) } #ifdef CATCH_CONFIG_CPP11_NULLPTR -TEST_CASE( "tuple", "[toString][tuple]" ) +TEST_CASE( "tuple", "[toString][tuple][c++11][.]" ) { typedef std::tuple type; type value { nullptr, 42, "Catch me" }; diff --git a/projects/SelfTest/TrickyTests.cpp b/projects/SelfTest/TrickyTests.cpp index eb53e420..90a4f2fa 100644 --- a/projects/SelfTest/TrickyTests.cpp +++ b/projects/SelfTest/TrickyTests.cpp @@ -387,7 +387,7 @@ TEST_CASE( "pointer to class", "[Tricky]" ) #include -TEST_CASE( "null_ptr", "[Tricky][c++11]" ) +TEST_CASE( "null_ptr", "[Tricky][c++11][.]" ) { std::unique_ptr ptr; REQUIRE(ptr.get() == nullptr); diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py index f665c317..88cc828e 100644 --- a/scripts/approvalTests.py +++ b/scripts/approvalTests.py @@ -114,15 +114,15 @@ print("Running approvals against executable:") print(" " + cmdPath) # Standard console reporter -approve("console.std", ["~_", "--order", "lex"]) +approve("console.std", ["~[c++11]", "--order", "lex"]) # console reporter, include passes, warn about No Assertions -approve("console.sw", ["~_", "-s", "-w", "NoAssertions", "--order", "lex"]) +approve("console.sw", ["~[c++11]", "-s", "-w", "NoAssertions", "--order", "lex"]) # console reporter, include passes, warn about No Assertions, limit failures to first 4 -approve("console.swa4", ["~_", "-s", "-w", "NoAssertions", "-x", "4", "--order", "lex"]) +approve("console.swa4", ["~[c++11]", "-s", "-w", "NoAssertions", "-x", "4", "--order", "lex"]) # junit reporter, include passes, warn about No Assertions -approve("junit.sw", ["~_", "-s", "-w", "NoAssertions", "-r", "junit", "--order", "lex"]) +approve("junit.sw", ["~[c++11]", "-s", "-w", "NoAssertions", "-r", "junit", "--order", "lex"]) # xml reporter, include passes, warn about No Assertions -approve("xml.sw", ["~_", "-s", "-w", "NoAssertions", "-r", "xml", "--order", "lex"]) +approve("xml.sw", ["~[c++11]", "-s", "-w", "NoAssertions", "-r", "xml", "--order", "lex"]) if overallResult != 0: print("If these differenecs are expected run approve.py to approve new baselines")