mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-04 14:09:33 +01:00 
			
		
		
		
	Merge from origin
This commit is contained in:
		@@ -373,6 +373,16 @@ ExceptionTests.cpp:<line number>: FAILED:
 | 
			
		||||
due to unexpected exception with message:
 | 
			
		||||
  3.14
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
./succeeding/message
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
MessageTests.cpp:<line number>
 | 
			
		||||
...............................................................................
 | 
			
		||||
 | 
			
		||||
MessageTests.cpp:<line number>:
 | 
			
		||||
warning:
 | 
			
		||||
  this is a warning
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
./failing/message/info/1
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
@@ -640,6 +650,16 @@ MiscTests.cpp:<line number>: FAILED:
 | 
			
		||||
with expansion:
 | 
			
		||||
  "this string contains 'abc' as a substring" equals: "something else"
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
Nice descriptive name
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
MiscTests.cpp:<line number>
 | 
			
		||||
...............................................................................
 | 
			
		||||
 | 
			
		||||
MiscTests.cpp:<line number>:
 | 
			
		||||
warning:
 | 
			
		||||
  This one ran
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
./failing/CatchSectionInfiniteLoop
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
@@ -680,6 +700,28 @@ Some information
 | 
			
		||||
An error
 | 
			
		||||
hello
 | 
			
		||||
hello
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
./inprogress/failing/Tricky/trailing expression
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
TrickyTests.cpp:<line number>
 | 
			
		||||
...............................................................................
 | 
			
		||||
 | 
			
		||||
TrickyTests.cpp:<line number>:
 | 
			
		||||
warning:
 | 
			
		||||
  Uncomment the code in this test to check that it gives a sensible compiler
 | 
			
		||||
  error
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
./inprogress/failing/Tricky/compound lhs
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
TrickyTests.cpp:<line number>
 | 
			
		||||
...............................................................................
 | 
			
		||||
 | 
			
		||||
TrickyTests.cpp:<line number>:
 | 
			
		||||
warning:
 | 
			
		||||
  Uncomment the code in this test to check that it gives a sensible compiler
 | 
			
		||||
  error
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
./failing/Tricky/non streamable type
 | 
			
		||||
-------------------------------------------------------------------------------
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user