Skip to content

Commit

Permalink
Change provideBazelReporterOutput to local linkage
Browse files Browse the repository at this point in the history
  • Loading branch information
horenmar committed Jun 17, 2022
1 parent 7e4ec43 commit 165647a
Showing 1 changed file with 22 additions and 23 deletions.
45 changes: 22 additions & 23 deletions src/catch2/catch_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,29 @@
#include <catch2/internal/catch_test_spec_parser.hpp>
#include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp>

namespace Catch {
namespace {
bool provideBazelReporterOutput() {
#ifdef CATCH_CONFIG_BAZEL_SUPPORT
return true;
#else

// Requires declaration for -Wmissing-declarations.
bool provideBazelReporterOutput();
# if defined( _MSC_VER )
// On Windows getenv throws a warning as there is no input validation,
// since the switch is hardcoded, this should not be an issue.
# pragma warning( push )
# pragma warning( disable : 4996 )
# endif

return std::getenv( "BAZEL_TEST" ) != nullptr;

# if defined( _MSC_VER )
# pragma warning( pop )
# endif
#endif
}
}

namespace Catch {

bool operator==( ProcessedReporterSpec const& lhs,
ProcessedReporterSpec const& rhs ) {
Expand Down Expand Up @@ -116,26 +135,6 @@ namespace Catch {
bool Config::listReporters() const { return m_data.listReporters; }
bool Config::listListeners() const { return m_data.listListeners; }

bool provideBazelReporterOutput() {
#ifdef CATCH_CONFIG_BAZEL_SUPPORT
return true;
#else

# if defined( _MSC_VER )
// On Windows getenv throws a warning as there is no input validation,
// since the switch is hardcoded, this should not be an issue.
# pragma warning( push )
# pragma warning( disable : 4996 )
# endif

return std::getenv("BAZEL_TEST") != nullptr;

# if defined( _MSC_VER )
# pragma warning( pop )
# endif
#endif
}

std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }

Expand Down

0 comments on commit 165647a

Please sign in to comment.