3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rebased approvals

This commit is contained in:
Phil Nash 2017-05-05 18:25:02 +01:00
parent 4c5af2089a
commit bada67bb72
3 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ with expansion:
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
REQUIRE( (*__errno_location ()) == 1 ) REQUIRE( (*__error()) == 1 )
with expansion: with expansion:
1 == 1 1 == 1
@ -6945,37 +6945,33 @@ TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what, Contains( "[@zzz]" ) ) CHECK_THAT( what, Contains( "[@zzz]" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "[@zzz]"
" contains: "[@zzz]"
TagAliasTests.cpp:<line number>: TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what, Contains( "file" ) ) CHECK_THAT( what, Contains( "file" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "file"
" contains: "file"
TagAliasTests.cpp:<line number>: TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what, Contains( "2" ) ) CHECK_THAT( what, Contains( "2" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "2"
" contains: "2"
TagAliasTests.cpp:<line number>: TagAliasTests.cpp:<line number>:
PASSED: PASSED:
CHECK_THAT( what, Contains( "10" ) ) CHECK_THAT( what, Contains( "10" ) )
with expansion: with expansion:
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "10"
" contains: "10"
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Tag alias can be registered against tag patterns Tag alias can be registered against tag patterns

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

@ -119,7 +119,7 @@ with expansion:
MiscTests.cpp:<line number>: MiscTests.cpp:<line number>:
PASSED: PASSED:
REQUIRE( (*__errno_location ()) == 1 ) REQUIRE( (*__error()) == 1 )
with expansion: with expansion:
1 == 1 1 == 1

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

@ -128,7 +128,7 @@
</Expression> </Expression>
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" > <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
<Original> <Original>
(*__errno_location ()) == 1 (*__error()) == 1
</Original> </Original>
<Expanded> <Expanded>
1 == 1 1 == 1
@ -7486,10 +7486,9 @@ hello
what, Contains( "[@zzz]" ) what, Contains( "[@zzz]" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "[@zzz]"
" contains: "[@zzz]"
</Expanded> </Expanded>
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
@ -7497,10 +7496,9 @@ hello
what, Contains( "file" ) what, Contains( "file" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "file"
" contains: "file"
</Expanded> </Expanded>
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
@ -7508,10 +7506,9 @@ hello
what, Contains( "2" ) what, Contains( "2" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "2"
" contains: "2"
</Expanded> </Expanded>
</Expression> </Expression>
<Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" > <Expression success="true" type="CHECK_THAT" filename="projects/<exe-name>/TagAliasTests.cpp" >
@ -7519,10 +7516,9 @@ hello
what, Contains( "10" ) what, Contains( "10" )
</Original> </Original>
<Expanded> <Expanded>
"error: tag alias, "[@zzz]" already registered. "error: tag alias, '[@zzz]' already registered.
First seen at file:2 First seen at: file:2
Redefined at file:10 Redefined at: file:10" contains: "10"
" contains: "10"
</Expanded> </Expanded>
</Expression> </Expression>
<OverallResults successes="4" failures="0" expectedFailures="0"/> <OverallResults successes="4" failures="0" expectedFailures="0"/>