From 225e90d8baf78d6b76d059d5e81aeb2faffa5dde Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 23 Jan 2017 17:47:58 +0000 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20include=20tests=20that=20rely?= =?UTF-8?q?=20on=20varying=20two-phase-lookup=20behaviour=20in=20approval?= =?UTF-8?q?=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Baselines/console.std.approved.txt | 4 +-- .../Baselines/console.sw.approved.txt | 30 ++----------------- .../SelfTest/Baselines/junit.sw.approved.txt | 4 +-- .../SelfTest/Baselines/xml.sw.approved.txt | 28 ++--------------- projects/SelfTest/ToStringWhich.cpp | 11 ++++--- scripts/approvalTests.py | 10 +++---- 6 files changed, 19 insertions(+), 68 deletions(-) diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index f5c53cd6..61b33905 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: 159 | 115 passed | 42 failed | 2 failed as expected -assertions: 915 | 819 passed | 78 failed | 18 failed as expected +test cases: 157 | 113 passed | 42 failed | 2 failed as expected +assertions: 913 | 817 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 4ac83ca2..2222058a 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -8757,32 +8757,6 @@ with expansion: == "{ StringMaker }" -------------------------------------------------------------------------------- -toString( vectors -............................................................................... - -ToStringWhich.cpp:: -PASSED: - REQUIRE( Catch::toString( v ) == "{ StringMaker }" ) -with expansion: - "{ StringMaker }" - == - "{ StringMaker }" - -------------------------------------------------------------------------------- -toString( vectors -............................................................................... - -ToStringWhich.cpp:: -PASSED: - REQUIRE( Catch::toString( v ) == "{ {?} }" ) -with expansion: - "{ {?} }" == "{ {?} }" - ------------------------------------------------------------------------------- toString(enum w/operator<<) ------------------------------------------------------------------------------- @@ -9052,6 +9026,6 @@ MiscTests.cpp:: PASSED: =============================================================================== -test cases: 159 | 114 passed | 43 failed | 2 failed as expected -assertions: 917 | 819 passed | 80 failed | 18 failed as expected +test cases: 157 | 112 passed | 43 failed | 2 failed as expected +assertions: 915 | 817 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 43b808a2..81eb0975 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,6 +1,6 @@ - + @@ -654,8 +654,6 @@ TrickyTests.cpp: - - diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index 33989783..0af58602 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -9246,30 +9246,6 @@ there" - - - - Catch::toString( v ) == "{ StringMaker<has_maker_and_toString> }" - - - "{ StringMaker<has_maker_and_toString> }" -== -"{ StringMaker<has_maker_and_toString> }" - - - - - - - - Catch::toString( v ) == "{ {?} }" - - - "{ {?} }" == "{ {?} }" - - - - @@ -9527,7 +9503,7 @@ there" - + - + diff --git a/projects/SelfTest/ToStringWhich.cpp b/projects/SelfTest/ToStringWhich.cpp index 1d4aa892..a1d2a609 100644 --- a/projects/SelfTest/ToStringWhich.cpp +++ b/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" ); } // 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 v(1); // This invokes template toString which actually gives us '{ ? }' REQUIRE( Catch::toString( v ) == "{ {?} }" ); @@ -61,7 +63,8 @@ TEST_CASE( "toString( vectors v(1); // Note: This invokes the template toString -> StringMaker REQUIRE( Catch::toString( v ) == "{ StringMaker }" ); diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py index e57241da..6c51aa4e 100644 --- a/scripts/approvalTests.py +++ b/scripts/approvalTests.py @@ -137,15 +137,15 @@ print("Running approvals against executable:") print(" " + cmdPath) # Standard console reporter -approve("console.std", ["~[c++11]", "--order", "lex"]) +approve("console.std", ["~[c++11]~[!nonportable]", "--order", "lex"]) # console reporter, include passes, warn about No Assertions -approve("console.sw", ["~[c++11]", "-s", "-w", "NoAssertions", "--order", "lex"]) +approve("console.sw", ["~[c++11]~[!nonportable]", "-s", "-w", "NoAssertions", "--order", "lex"]) # console reporter, include passes, warn about No Assertions, limit failures to first 4 -approve("console.swa4", ["~[c++11]", "-s", "-w", "NoAssertions", "-x", "4", "--order", "lex"]) +approve("console.swa4", ["~[c++11]~[!nonportable]", "-s", "-w", "NoAssertions", "-x", "4", "--order", "lex"]) # junit reporter, include passes, warn about No Assertions -approve("junit.sw", ["~[c++11]", "-s", "-w", "NoAssertions", "-r", "junit", "--order", "lex"]) +approve("junit.sw", ["~[c++11]~[!nonportable]", "-s", "-w", "NoAssertions", "-r", "junit", "--order", "lex"]) # xml reporter, include passes, warn about No Assertions -approve("xml.sw", ["~[c++11]", "-s", "-w", "NoAssertions", "-r", "xml", "--order", "lex"]) +approve("xml.sw", ["~[c++11]~[!nonportable]", "-s", "-w", "NoAssertions", "-r", "xml", "--order", "lex"]) if overallResult != 0: print("If these differenecs are expected run approve.py to approve new baselines")