Skip to content

Commit

Permalink
tests: Update Catch2 to 2.13.9
Browse files Browse the repository at this point in the history
  • Loading branch information
lzaoral authored and mchalupa committed May 5, 2022
1 parent 89ea032 commit c5e0aa0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} ${CTEST_OPTS}
# --------------------------------------------------

# version of bundled Catch2
set(CATCH_VERSION 2.13.7)
set(CATCH_VERSION 2.13.9)

# Catch2 main
add_library(catch-main OBJECT catch-main.cpp)
Expand Down
14 changes: 9 additions & 5 deletions tests/catch2/catch.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Catch v2.13.8
* Generated: 2022-01-03 21:20:09.589503
* Catch v2.13.9
* Generated: 2022-04-12 22:37:23.260201
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
Expand All @@ -15,7 +15,7 @@

#define CATCH_VERSION_MAJOR 2
#define CATCH_VERSION_MINOR 13
#define CATCH_VERSION_PATCH 8
#define CATCH_VERSION_PATCH 9

#ifdef __clang__
# pragma clang system_header
Expand Down Expand Up @@ -13392,6 +13392,10 @@ namespace Catch {
filename.erase(0, lastSlash);
filename[0] = '#';
}
else
{
filename.insert(0, "#");
}

auto lastDot = filename.find_last_of('.');
if (lastDot != std::string::npos) {
Expand Down Expand Up @@ -15387,7 +15391,7 @@ namespace Catch {
}

Version const& libraryVersion() {
static Version version( 2, 13, 8, "", 0 );
static Version version( 2, 13, 9, "", 0 );
return version;
}

Expand Down Expand Up @@ -17890,7 +17894,7 @@ using Catch::Detail::Approx;
#define INFO( msg ) (void)(0)
#define UNSCOPED_INFO( msg ) (void)(0)
#define WARN( msg ) (void)(0)
#define CAPTURE( msg ) (void)(0)
#define CAPTURE( ... ) (void)(0)

#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
Expand Down

0 comments on commit c5e0aa0

Please sign in to comment.