mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 04:07:10 +01:00 
			
		
		
		
	Add disabling the use of Android's logging at compile time
This is done via the new compile time toggle, `CATCH_CONFIG_ANDROID_LOGWRITE`. Closes #1743
This commit is contained in:
		| @@ -155,6 +155,9 @@ by using `_NO_` in the macro, e.g. `CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS`. | ||||
|     CATCH_CONFIG_EXPERIMENTAL_REDIRECT      // Enables the new (experimental) way of capturing stdout/stderr | ||||
|     CATCH_CONFIG_ENABLE_BENCHMARKING        // Enables the integrated benchmarking features (has a significant effect on compilation speed) | ||||
|     CATCH_CONFIG_USE_ASYNC                  // Force parallel statistical processing of samples during benchmarking | ||||
|     CATCH_CONFIG_ANDROID_LOGWRITE           // Use android's logging system for debug output | ||||
|  | ||||
| > `CATCH_CONFIG_ANDROID_LOGWRITE` was [introduced](https://github.com/catchorg/Catch2/issues/1743) in Catch X.Y.Z | ||||
|  | ||||
| Currently Catch enables `CATCH_CONFIG_WINDOWS_SEH` only when compiled with MSVC, because some versions of MinGW do not have the necessary Win32 API support. | ||||
|  | ||||
|   | ||||
| @@ -94,6 +94,7 @@ | ||||
| // Android somehow still does not support std::to_string | ||||
| #if defined(__ANDROID__) | ||||
| #    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING | ||||
| #    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE | ||||
| #endif | ||||
|  | ||||
| //////////////////////////////////////////////////////////////////////////////// | ||||
| @@ -301,6 +302,10 @@ | ||||
| #  define CATCH_CONFIG_USE_ASYNC | ||||
| #endif | ||||
|  | ||||
| #if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) | ||||
| #  define CATCH_CONFIG_ANDROID_LOGWRITE | ||||
| #endif | ||||
|  | ||||
| #if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) | ||||
| #   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS | ||||
| #   define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS | ||||
|   | ||||
| @@ -7,11 +7,12 @@ | ||||
|  */ | ||||
|  | ||||
| #include "catch_debug_console.h" | ||||
| #include "catch_compiler_capabilities.h" | ||||
| #include "catch_stream.h" | ||||
| #include "catch_platform.h" | ||||
| #include "catch_windows_h_proxy.h" | ||||
|  | ||||
| #if defined(__ANDROID__) | ||||
| #if defined(CATCH_CONFIG_ANDROID_LOGWRITE) | ||||
| #include <android/log.h> | ||||
|  | ||||
|     namespace Catch { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Martin Hořeňovský
					Martin Hořeňovský