3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 15:26:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed function pointer comparison test from approvals as it has different serilaisation behaviour in MSVC

Browse Source
This commit is contained in:
Phil Nash 2017-09-07 15:04:30 +01:00
parent ca7021ae19
commit 6105282c4f
6 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/SelfTest/Baselines/console.std.approved.txt
View File

@ -1003,6 +1003,6 @@ with expansion:
"{?}" == "1" "{?}" == "1"
=============================================================================== ===============================================================================
test cases: 178 | 127 passed | 47 failed | 4 failed as expected test cases: 177 | 126 passed | 47 failed | 4 failed as expected
assertions: 879 | 762 passed | 96 failed | 21 failed as expected assertions: 878 | 761 passed | 96 failed | 21 failed as expected

16
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@ -156,18 +156,6 @@ with expansion:
with message: with message:
dummy := 0 dummy := 0
-------------------------------------------------------------------------------
#925: comparing function pointer to function address failed to compile
-------------------------------------------------------------------------------
TrickyTests.cpp:<line number>
...............................................................................
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( utility::synchronizing_callback != test.testMethod_uponComplete_arg )
with expansion:
1 != 0
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
#961 -- Dynamically created sections should all be reported #961 -- Dynamically created sections should all be reported
Looped section 0 Looped section 0
@ -7446,6 +7434,6 @@ MiscTests.cpp:<line number>:
PASSED: PASSED:
=============================================================================== ===============================================================================
test cases: 178 | 125 passed | 49 failed | 4 failed as expected test cases: 177 | 124 passed | 49 failed | 4 failed as expected
assertions: 878 | 758 passed | 99 failed | 21 failed as expected assertions: 877 | 757 passed | 99 failed | 21 failed as expected

16
projects/SelfTest/Baselines/console.swa4.approved.txt
View File

@ -156,18 +156,6 @@ with expansion:
with message: with message:
dummy := 0 dummy := 0
-------------------------------------------------------------------------------
#925: comparing function pointer to function address failed to compile
-------------------------------------------------------------------------------
TrickyTests.cpp:<line number>
...............................................................................
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( utility::synchronizing_callback != test.testMethod_uponComplete_arg )
with expansion:
1 != 0
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
#961 -- Dynamically created sections should all be reported #961 -- Dynamically created sections should all be reported
Looped section 0 Looped section 0
@ -249,6 +237,6 @@ ConditionTests.cpp:<line number>: FAILED:
CHECK_FALSE( true ) CHECK_FALSE( true )
=============================================================================== ===============================================================================
test cases: 10 | 7 passed | 1 failed | 2 failed as expected test cases: 9 | 6 passed | 1 failed | 2 failed as expected
assertions: 27 | 20 passed | 4 failed | 3 failed as expected assertions: 26 | 19 passed | 4 failed | 3 failed as expected

3
projects/SelfTest/Baselines/junit.sw.approved.txt
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<testsuitesloose text artifact <testsuitesloose text artifact
> >
<testsuite name="<exe-name>" errors="15" failures="85" tests="879" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> <testsuite name="<exe-name>" errors="15" failures="85" tests="878" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/> <testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/>
<testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}"/> <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}"/>
<testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/outside assertions" time="{duration}"> <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/outside assertions" time="{duration}">
@ -27,7 +27,6 @@ MiscTests.cpp:<line number>
</failure> </failure>
</testcase> </testcase>
<testcase classname="<exe-name>.global" name="#872" time="{duration}"/> <testcase classname="<exe-name>.global" name="#872" time="{duration}"/>
<testcase classname="<exe-name>.global" name="#925: comparing function pointer to function address failed to compile" time="{duration}"/>
<testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 0" time="{duration}"/> <testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 0" time="{duration}"/>
<testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 1" time="{duration}"/> <testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 1" time="{duration}"/>
<testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 2" time="{duration}"/> <testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 2" time="{duration}"/>

15
projects/SelfTest/Baselines/xml.sw.approved.txt
View File

@ -169,17 +169,6 @@
</Expression> </Expression>
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
<TestCase name="#925: comparing function pointer to function address failed to compile" filename="projects/<exe-name>/TrickyTests.cpp" >
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" >
<Original>
utility::synchronizing_callback != test.testMethod_uponComplete_arg
</Original>
<Expanded>
1 != 0
</Expanded>
</Expression>
<OverallResult success="true"/>
</TestCase>
<TestCase name="#961 -- Dynamically created sections should all be reported" tags="[.]" filename="projects/<exe-name>/MiscTests.cpp" > <TestCase name="#961 -- Dynamically created sections should all be reported" tags="[.]" filename="projects/<exe-name>/MiscTests.cpp" >
<Section name="Looped section 0" filename="projects/<exe-name>/MiscTests.cpp" > <Section name="Looped section 0" filename="projects/<exe-name>/MiscTests.cpp" >
<OverallResults successes="1" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
@ -8223,7 +8212,7 @@ loose text artifact
</Section> </Section>
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
<OverallResults successes="758" failures="100" expectedFailures="21"/> <OverallResults successes="757" failures="100" expectedFailures="21"/>
</Group> </Group>
<OverallResults successes="758" failures="99" expectedFailures="21"/> <OverallResults successes="757" failures="99" expectedFailures="21"/>
</Catch> </Catch>

3
projects/SelfTest/TrickyTests.cpp
View File

@ -434,7 +434,8 @@ namespace utility {
inline static void synchronizing_callback( void * ) { } inline static void synchronizing_callback( void * ) { }
} }
TEST_CASE("#925: comparing function pointer to function address failed to compile") { TEST_CASE("#925: comparing function pointer to function address failed to compile", "[!nonportable]" ) {
TestClass test; TestClass test;
REQUIRE(utility::synchronizing_callback != test.testMethod_uponComplete_arg); REQUIRE(utility::synchronizing_callback != test.testMethod_uponComplete_arg);
} }