diff options
| author | Martin Hořeňovský | 2022-09-02 07:11:24 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-09-02 07:11:28 +0200 |
| commit | 7b2e7d623b626ed2cae1d4b7f2b5480bdabbefd8 (patch) | |
| tree | 19678e7f2721c224baf567df6909a74b51c63d4f | |
| parent | 3ca5cf32e59f77b3af106367fe725c336034667b (diff) | |
| download | catch3-7b2e7d623b626ed2cae1d4b7f2b5480bdabbefd8.tar.gz | |
Disable Bazel's env checking on UWP
UWP does not support environment variables and so it cannot
compile code using getenv.
| -rw-r--r-- | src/catch2/catch_config.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp index 4465831d..4cb3627d 100644 --- a/src/catch2/catch_config.cpp +++ b/src/catch2/catch_config.cpp @@ -8,6 +8,7 @@ #include <catch2/catch_config.hpp> #include <catch2/catch_user_config.hpp> #include <catch2/internal/catch_enforce.hpp> +#include <catch2/internal/catch_platform.hpp> #include <catch2/internal/catch_stringref.hpp> #include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_test_spec_parser.hpp> @@ -15,8 +16,11 @@ namespace { bool provideBazelReporterOutput() { -#ifdef CATCH_CONFIG_BAZEL_SUPPORT +#if defined(CATCH_CONFIG_BAZEL_SUPPORT) return true; +#elif defined(CATCH_PLATFORM_WINDOWS_UWP) + // UWP does not support environment variables + return false; #else # if defined( _MSC_VER ) @@ -81,6 +85,7 @@ namespace Catch { } ); } +#if !defined(CATCH_PLATFORM_WINDOWS_UWP) if(provideBazelReporterOutput()){ // Register a JUnit reporter for Bazel. Bazel sets an environment // variable with the path to XML output. If this file is written to @@ -102,7 +107,7 @@ namespace Catch { { "junit", std::string( bazelOutputFilePtr ), {}, {} } ); } } - +#endif // We now fixup the reporter specs to handle default output spec, // default colour spec, etc |