Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package Catch2-2 for openSUSE:Factory
checked in at 2023-01-21 19:10:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Catch2-2 (Old)
and /work/SRC/openSUSE:Factory/.Catch2-2.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Catch2-2"
Sat Jan 21 19:10:04 2023 rev:2 rq:1059877 version:2.13.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/Catch2-2/Catch2-2.changes 2022-10-14
15:43:21.644000699 +0200
+++ /work/SRC/openSUSE:Factory/.Catch2-2.new.32243/Catch2-2.changes
2023-01-21 19:10:10.376822947 +0100
@@ -1,0 +2,13 @@
+Wed Jan 18 08:32:54 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Update to version 2.13.10:
+ * Fixed issue with catch_discover_tests when there is multiple of
+ 256 tests (gh#catchorg/Catch2#2401, gh#catchorg/Catch2#2503).
+ * Catch2-provided main and wmain are explicitly marked as __cdecl
+ when compiled with MSVC (gh#catchorg/Catch2#2486,
+ gh#catchorg/Catch2#2487).
+ * Replaced deprecated std::aligned_storage
+ (gh#catchorg/Catch2#2419, gh#catchorg/Catch2#2420).
+- Minor rebase of fix-pragmas-old-gcc.patch to apply cleanly.
+
+-------------------------------------------------------------------
Old:
----
Catch2-2.13.9.tar.gz
New:
----
Catch2-2.13.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Catch2-2.spec ++++++
--- /var/tmp/diff_new_pack.MqgALZ/_old 2023-01-21 19:10:10.948826212 +0100
+++ /var/tmp/diff_new_pack.MqgALZ/_new 2023-01-21 19:10:10.952826235 +0100
@@ -1,7 +1,7 @@
#
# spec file for package Catch2-2
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define srcname Catch2
Name: Catch2-2
-Version: 2.13.9
+Version: 2.13.10
Release: 0
Summary: A modern, C++-native, header-only, test framework for
unit-tests, TDD and BDD
License: BSL-1.0
++++++ Catch2-2.13.9.tar.gz -> Catch2-2.13.10.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/CMakeLists.txt
new/Catch2-2.13.10/CMakeLists.txt
--- old/Catch2-2.13.9/CMakeLists.txt 2022-04-12 22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/CMakeLists.txt 2022-10-16 11:02:17.000000000 +0200
@@ -16,7 +16,7 @@
endif()
-project(Catch2 LANGUAGES CXX VERSION 2.13.9)
+project(Catch2 LANGUAGES CXX VERSION 2.13.10)
# Provide path for scripts
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/README.md new/Catch2-2.13.10/README.md
--- old/Catch2-2.13.9/README.md 2022-04-12 22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/README.md 2022-10-16 11:02:17.000000000 +0200
@@ -9,7 +9,7 @@
[](https://discord.gg/4CWS9zD)
-<a
href="https://github.com/catchorg/Catch2/releases/download/v2.13.9/catch.hpp";>The
latest version of the single header can be downloaded directly using this
link</a>
+<a
href="https://github.com/catchorg/Catch2/releases/download/v2.13.10/catch.hpp";>The
latest version of the single header can be downloaded directly using this
link</a>
## Catch2 is released!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/docs/cmake-integration.md
new/Catch2-2.13.10/docs/cmake-integration.md
--- old/Catch2-2.13.9/docs/cmake-integration.md 2022-04-12 22:38:17.000000000
+0200
+++ new/Catch2-2.13.10/docs/cmake-integration.md 2022-10-16
11:02:17.000000000 +0200
@@ -43,7 +43,8 @@
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
- GIT_TAG v2.13.1)
+ GIT_TAG v2.13.9 # or a later release
+)
FetchContent_MakeAvailable(Catch2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/docs/release-notes.md
new/Catch2-2.13.10/docs/release-notes.md
--- old/Catch2-2.13.9/docs/release-notes.md 2022-04-12 22:38:17.000000000
+0200
+++ new/Catch2-2.13.10/docs/release-notes.md 2022-10-16 11:02:17.000000000
+0200
@@ -2,6 +2,7 @@
# Release notes
**Contents**<br>
+[2.13.10](#21310)<br>
[2.13.9](#2139)<br>
[2.13.8](#2138)<br>
[2.13.7](#2137)<br>
@@ -50,6 +51,15 @@
[Even Older versions](#even-older-versions)<br>
+## 2.13.10
+
+### Fixes
+* Fixed issue with `catch_discover_tests` when there is multiple of 256 tests
(#2401, #2503)
+* Catch2-provided `main` and `wmain` are explicitly marked as `__cdecl` when
compiled with MSVC (#2486, #2487)
+* Improved break-into-debugger behaviour for ARM Macs. It should now be
possible to step execution after the break (#2422)
+* Replaced deprecated `std::aligned_storage` (#2419, #2420)
+
+
## 2.13.9
### Fixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/include/catch.hpp
new/Catch2-2.13.10/include/catch.hpp
--- old/Catch2-2.13.9/include/catch.hpp 2022-04-12 22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/include/catch.hpp 2022-10-16 11:02:17.000000000
+0200
@@ -11,7 +11,7 @@
#define CATCH_VERSION_MAJOR 2
#define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 9
+#define CATCH_VERSION_PATCH 10
#ifdef __clang__
# pragma clang system_header
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catch2-2.13.9/include/internal/benchmark/catch_constructor.hpp
new/Catch2-2.13.10/include/internal/benchmark/catch_constructor.hpp
--- old/Catch2-2.13.9/include/internal/benchmark/catch_constructor.hpp
2022-04-12 22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/include/internal/benchmark/catch_constructor.hpp
2022-10-16 11:02:17.000000000 +0200
@@ -19,8 +19,6 @@
template <typename T, bool Destruct>
struct ObjectStorage
{
- using TStorage = typename std::aligned_storage<sizeof(T),
std::alignment_of<T>::value>::type;
-
ObjectStorage() : data() {}
ObjectStorage(const ObjectStorage& other)
@@ -64,7 +62,7 @@
}
- TStorage data;
+ struct { alignas(T) unsigned char data[sizeof(T)]; } data;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/include/internal/catch_debugger.h
new/Catch2-2.13.10/include/internal/catch_debugger.h
--- old/Catch2-2.13.9/include/internal/catch_debugger.h 2022-04-12
22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/include/internal/catch_debugger.h 2022-10-16
11:02:17.000000000 +0200
@@ -20,7 +20,7 @@
#if defined(__i386__) || defined(__x86_64__)
#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
#elif defined(__aarch64__)
- #define CATCH_TRAP() __asm__(".inst 0xd4200000")
+ #define CATCH_TRAP() __asm__(".inst 0xd43e0000")
#endif
#elif defined(CATCH_PLATFORM_IPHONE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catch2-2.13.9/include/internal/catch_default_main.hpp
new/Catch2-2.13.10/include/internal/catch_default_main.hpp
--- old/Catch2-2.13.9/include/internal/catch_default_main.hpp 2022-04-12
22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/include/internal/catch_default_main.hpp 2022-10-16
11:02:17.000000000 +0200
@@ -13,12 +13,20 @@
#ifndef __OBJC__
+#ifndef CATCH_INTERNAL_CDECL
+#ifdef _MSC_VER
+#define CATCH_INTERNAL_CDECL __cdecl
+#else
+#define CATCH_INTERNAL_CDECL
+#endif
+#endif
+
#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) &&
defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t
* []) {
#else
// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
+int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
#endif
return Catch::Session().run( argc, argv );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/include/internal/catch_session.cpp
new/Catch2-2.13.10/include/internal/catch_session.cpp
--- old/Catch2-2.13.9/include/internal/catch_session.cpp 2022-04-12
22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/include/internal/catch_session.cpp 2022-10-16
11:02:17.000000000 +0200
@@ -293,7 +293,7 @@
// Handle list request
if( Option<std::size_t> listed = list( m_config ) )
- return static_cast<int>( *listed );
+ return (std::min) (MaxExitCode, static_cast<int>(*listed));
TestGroup tests { m_config };
auto const totals = tests.execute();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/include/internal/catch_version.cpp
new/Catch2-2.13.10/include/internal/catch_version.cpp
--- old/Catch2-2.13.9/include/internal/catch_version.cpp 2022-04-12
22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/include/internal/catch_version.cpp 2022-10-16
11:02:17.000000000 +0200
@@ -37,7 +37,7 @@
}
Version const& libraryVersion() {
- static Version version( 2, 13, 9, "", 0 );
+ static Version version( 2, 13, 10, "", 0 );
return version;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/projects/CMakeLists.txt
new/Catch2-2.13.10/projects/CMakeLists.txt
--- old/Catch2-2.13.9/projects/CMakeLists.txt 2022-04-12 22:38:17.000000000
+0200
+++ new/Catch2-2.13.10/projects/CMakeLists.txt 2022-10-16 11:02:17.000000000
+0200
@@ -354,7 +354,7 @@
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code
-Wpedantic -Wmissing-declarations )
if (CATCH_ENABLE_WERROR)
- target_compile_options( SelfTest PRIVATE -Werror )
+ target_compile_options( SelfTest PRIVATE -Werror -Wno-error=pragmas )
endif()
endif()
# Clang specific options go here
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp
new/Catch2-2.13.10/projects/SelfTest/UsageTests/Message.tests.cpp
--- old/Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp
2022-04-12 22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/projects/SelfTest/UsageTests/Message.tests.cpp
2022-10-16 11:02:17.000000000 +0200
@@ -241,17 +241,19 @@
return out;
}
+// clang can handle GCC's diagnostic pragma
+#if defined( __GNUG__ ) || defined(__clang__)
+# pragma GCC diagnostic push
+#endif
// Clang and gcc have different names for this warning, and clang also
// warns about an unused value
-#if defined(__GNUG__) && !defined(__clang__)
-#pragma GCC diagnostic push
+#if defined( __GNUG__ ) && !defined( __clang__ ) && \
+ ( __GNUG__ > 10 || ( __GNUG__ == 10 && __GNUC_MINOR__ >= 1 ) )
#pragma GCC diagnostic ignored "-Wcomma-subscript"
#elif defined(__clang__)
-#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-comma-subscript"
#pragma clang diagnostic ignored "-Wunused-value"
#endif
-
TEST_CASE("CAPTURE can deal with complex expressions involving commas",
"[messages][capture]") {
CAPTURE(std::vector<int>{1, 2, 3}[0, 1, 2],
std::vector<int>{1, 2, 3}[(0, 1)],
@@ -261,9 +263,8 @@
CAPTURE( (1, 2), (2, 3) );
SUCCEED();
}
-
-#ifdef __GNUG__
-#pragma GCC diagnostic pop
+#if defined( __GNUG__ ) || defined(__clang__)
+# pragma GCC diagnostic pop
#endif
TEST_CASE("CAPTURE parses string and character constants",
"[messages][capture]") {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catch2-2.13.9/single_include/catch2/catch.hpp
new/Catch2-2.13.10/single_include/catch2/catch.hpp
--- old/Catch2-2.13.9/single_include/catch2/catch.hpp 2022-04-12
22:38:17.000000000 +0200
+++ new/Catch2-2.13.10/single_include/catch2/catch.hpp 2022-10-16
11:02:17.000000000 +0200
@@ -1,6 +1,6 @@
/*
- * Catch v2.13.9
- * Generated: 2022-04-12 22:37:23.260201
+ * Catch v2.13.10
+ * Generated: 2022-10-16 11:01:23.452308
* ----------------------------------------------------------
* 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 9
+#define CATCH_VERSION_PATCH 10
#ifdef __clang__
# pragma clang system_header
@@ -7395,8 +7395,6 @@
template <typename T, bool Destruct>
struct ObjectStorage
{
- using TStorage = typename std::aligned_storage<sizeof(T),
std::alignment_of<T>::value>::type;
-
ObjectStorage() : data() {}
ObjectStorage(const ObjectStorage& other)
@@ -7439,7 +7437,7 @@
return *static_cast<T*>(static_cast<void*>(&data));
}
- TStorage data;
+ struct { alignas(T) unsigned char data[sizeof(T)]; } data;
};
}
@@ -7949,7 +7947,7 @@
#if defined(__i386__) || defined(__x86_64__)
#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
#elif defined(__aarch64__)
- #define CATCH_TRAP() __asm__(".inst 0xd4200000")
+ #define CATCH_TRAP() __asm__(".inst 0xd43e0000")
#endif
#elif defined(CATCH_PLATFORM_IPHONE)
@@ -13558,7 +13556,7 @@
// Handle list request
if( Option<std::size_t> listed = list( m_config ) )
- return static_cast<int>( *listed );
+ return (std::min) (MaxExitCode, static_cast<int>(*listed));
TestGroup tests { m_config };
auto const totals = tests.execute();
@@ -15391,7 +15389,7 @@
}
Version const& libraryVersion() {
- static Version version( 2, 13, 9, "", 0 );
+ static Version version( 2, 13, 10, "", 0 );
return version;
}
@@ -17526,12 +17524,20 @@
#ifndef __OBJC__
+#ifndef CATCH_INTERNAL_CDECL
+#ifdef _MSC_VER
+#define CATCH_INTERNAL_CDECL __cdecl
+#else
+#define CATCH_INTERNAL_CDECL
+#endif
+#endif
+
#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) &&
defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t
* []) {
#else
// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
+int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
#endif
return Catch::Session().run( argc, argv );
++++++ fix-pragmas-old-gcc.patch ++++++
--- /var/tmp/diff_new_pack.MqgALZ/_old 2023-01-21 19:10:11.168827468 +0100
+++ /var/tmp/diff_new_pack.MqgALZ/_new 2023-01-21 19:10:11.168827468 +0100
@@ -1,22 +1,23 @@
-diff -Nur Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp
new/projects/SelfTest/UsageTests/Message.tests.cpp
---- Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp
2022-04-12 22:38:17.000000000 +0200
-+++ new/projects/SelfTest/UsageTests/Message.tests.cpp 2022-04-26
14:20:39.792719016 +0200
-@@ -243,7 +243,7 @@
+Index: Catch2-2.13.10/projects/SelfTest/UsageTests/Message.tests.cpp
+===================================================================
+--- Catch2-2.13.10.orig/projects/SelfTest/UsageTests/Message.tests.cpp
++++ Catch2-2.13.10/projects/SelfTest/UsageTests/Message.tests.cpp
+@@ -242,7 +242,7 @@ std::ostream& operator<<(std::ostream& o
+ }
+ // clang can handle GCC's diagnostic pragma
+-#if defined( __GNUG__ ) || defined(__clang__)
++#if defined( __GNUG__ ) && __GNUG__ >= 8 || defined(__clang__)
+ # pragma GCC diagnostic push
+ #endif
// Clang and gcc have different names for this warning, and clang also
- // warns about an unused value
--#if defined(__GNUG__) && !defined(__clang__)
-+#if defined(__GNUG__) && __GNUG__ >= 8 && !defined(__clang__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wcomma-subscript"
- #elif defined(__clang__)
-@@ -262,7 +262,7 @@
+@@ -263,7 +263,7 @@ TEST_CASE("CAPTURE can deal with complex
+ CAPTURE( (1, 2), (2, 3) );
SUCCEED();
}
-
--#ifdef __GNUG__
-+#if defined(__GNUG__) && __GNUG__ >= 8
- #pragma GCC diagnostic pop
+-#if defined( __GNUG__ ) || defined(__clang__)
++#if defined( __GNUG__ ) && __GNUG__ >= 8 || defined(__clang__)
+ # pragma GCC diagnostic pop
#endif
