mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 12:17:11 +01:00 
			
		
		
		
	Merge pull request #1611 from cincodenada/unscoped-disabled-prefixed
Add UNSCOPED_INFO to prefix/disabled sections
This commit is contained in:
		| @@ -132,6 +132,7 @@ | ||||
| #endif // CATCH_CONFIG_DISABLE_MATCHERS | ||||
|  | ||||
| #define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg ) | ||||
| #define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg ) | ||||
| #define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg ) | ||||
| #define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ ) | ||||
|  | ||||
| @@ -306,6 +307,7 @@ using Catch::Detail::Approx; | ||||
| #endif // CATCH_CONFIG_DISABLE_MATCHERS | ||||
|  | ||||
| #define CATCH_INFO( msg )          (void)(0) | ||||
| #define CATCH_UNSCOPED_INFO( msg ) (void)(0) | ||||
| #define CATCH_WARN( msg )          (void)(0) | ||||
| #define CATCH_CAPTURE( msg )       (void)(0) | ||||
|  | ||||
| @@ -382,6 +384,7 @@ using Catch::Detail::Approx; | ||||
| #endif // CATCH_CONFIG_DISABLE_MATCHERS | ||||
|  | ||||
| #define INFO( msg ) (void)(0) | ||||
| #define UNSCOPED_INFO( msg ) (void)(0) | ||||
| #define WARN( msg ) (void)(0) | ||||
| #define CAPTURE( msg ) (void)(0) | ||||
|  | ||||
|   | ||||
| @@ -48,6 +48,7 @@ CATCH_TEST_CASE("PrefixedMacros") { | ||||
|     CATCH_CHECK_THAT("bdef", Equals("bdef")); | ||||
|  | ||||
|     CATCH_INFO( "some info" ); | ||||
|     CATCH_UNSCOPED_INFO( "some info" ); | ||||
|     CATCH_WARN( "some warn" ); | ||||
|     CATCH_SECTION("some section") { | ||||
|         int i = 1; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Martin Hořeňovský
					Martin Hořeňovský