3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 07:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable Bazel's env checking on UWP

Browse Source 
UWP does not support environment variables and so it cannot
compile code using getenv.
This commit is contained in:
Martin Hořeňovský 2022-09-02 07:11:24 +02:00
parent 3ca5cf32e5
commit 7b2e7d623b
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/catch2/catch_config.cpp
View File

@ -8,6 +8,7 @@
#include <catch2/catch_config.hpp> #include <catch2/catch_config.hpp>
#include <catch2/catch_user_config.hpp> #include <catch2/catch_user_config.hpp>
#include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_enforce.hpp>
#include <catch2/internal/catch_platform.hpp>
#include <catch2/internal/catch_stringref.hpp> #include <catch2/internal/catch_stringref.hpp>
#include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_string_manip.hpp>
#include <catch2/internal/catch_test_spec_parser.hpp> #include <catch2/internal/catch_test_spec_parser.hpp>
@ -15,8 +16,11 @@
namespace { namespace {
bool provideBazelReporterOutput() { bool provideBazelReporterOutput() {
#ifdef CATCH_CONFIG_BAZEL_SUPPORT #if defined(CATCH_CONFIG_BAZEL_SUPPORT)
return true; return true;
#elif defined(CATCH_PLATFORM_WINDOWS_UWP)
// UWP does not support environment variables
return false;
#else #else
# if defined( _MSC_VER ) # if defined( _MSC_VER )
@ -81,6 +85,7 @@ namespace Catch {
} ); } );
} }
#if !defined(CATCH_PLATFORM_WINDOWS_UWP)
if(provideBazelReporterOutput()){ if(provideBazelReporterOutput()){
// Register a JUnit reporter for Bazel. Bazel sets an environment // Register a JUnit reporter for Bazel. Bazel sets an environment
// variable with the path to XML output. If this file is written to // variable with the path to XML output. If this file is written to
@ -102,7 +107,7 @@ namespace Catch {
{ "junit", std::string( bazelOutputFilePtr ), {}, {} } ); { "junit", std::string( bazelOutputFilePtr ), {}, {} } );
} }
} }
#endif
// We now fixup the reporter specs to handle default output spec, // We now fixup the reporter specs to handle default output spec,
// default colour spec, etc // default colour spec, etc