diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-07-01 13:55:53 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-06 15:12:42 +0000 |
| commit | 6d22b962879ecca4969aa16c1ba0ef68efbf5d94 (patch) | |
| tree | fa630834a7833b264d8393c6050ead90573a3627 /tests/auto | |
| parent | 1766442fefa4e6d6a582ae98162dd09db9f70de8 (diff) | |
| download | qttools-6d22b962879ecca4969aa16c1ba0ef68efbf5d94.tar.gz | |
Update Catch2 to v2.13.9
Unlike the qtbase copy, there're no Qt patches applied to this version.
Fixes: QTBUG-104711
Change-Id: Ifb1dc39bc771d25cbe5b77142a26274167b49c3f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 46aad16fc504fd1f0127e1f843ea3d5a2e59feb5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qdoc/catch/catch.hpp | 14 | ||||
| -rw-r--r-- | tests/auto/qdoc/catch/qt_attribution.json | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/qdoc/catch/catch.hpp b/tests/auto/qdoc/catch/catch.hpp index db1fed3b9..d2a12427b 100644 --- a/tests/auto/qdoc/catch/catch.hpp +++ b/tests/auto/qdoc/catch/catch.hpp @@ -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. @@ -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 @@ -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) { @@ -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; } @@ -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_ )) diff --git a/tests/auto/qdoc/catch/qt_attribution.json b/tests/auto/qdoc/catch/qt_attribution.json index 539d3aae8..02e33f25d 100644 --- a/tests/auto/qdoc/catch/qt_attribution.json +++ b/tests/auto/qdoc/catch/qt_attribution.json @@ -8,7 +8,7 @@ "Description": "Catch2 is a multi-paradigm test framework for C++.", "Homepage": "https://github.com/catchorg/Catch2", - "Version": "2.13.8", + "Version": "2.13.9", "License": "Boost Software License 1.0", "LicenseId": "BSL-1.0", "LicenseFile": "CATCH_LICENSE.txt", |