Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
@ -1 +0,0 @@
|
||||
340a18695d88be7c27574eaa88002a249cf851d8 SOURCES/catch1-1.12.1.tar.gz
|
||||
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -1 +1,3 @@
|
||||
SOURCES/catch1-1.12.1.tar.gz
|
||||
/catch1-1.12.0.tar.gz
|
||||
/catch1-1.12.1.tar.gz
|
||||
/catch1-1.12.2.tar.gz
|
||||
|
||||
68
catch1-sigstksz.patch
Normal file
68
catch1-sigstksz.patch
Normal file
@ -0,0 +1,68 @@
|
||||
commit 34650cd9ea2f7e4aa1e61b84ecf9913b87870680
|
||||
Author: Tom Hughes <tom@compton.nu>
|
||||
Date: Fri Feb 19 10:45:49 2021 +0000
|
||||
|
||||
Patch for non-constant SIGSTKSZ
|
||||
|
||||
diff --git a/include/internal/catch_fatal_condition.hpp b/include/internal/catch_fatal_condition.hpp
|
||||
index 1dcd545d..f7d9e10d 100644
|
||||
--- a/include/internal/catch_fatal_condition.hpp
|
||||
+++ b/include/internal/catch_fatal_condition.hpp
|
||||
@@ -136,7 +136,7 @@ namespace Catch {
|
||||
static bool isSet;
|
||||
static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
|
||||
static stack_t oldSigStack;
|
||||
- static char altStackMem[SIGSTKSZ];
|
||||
+ static char altStackMem[32768];
|
||||
|
||||
static void handleSignal( int sig ) {
|
||||
std::string name = "<unknown signal>";
|
||||
@@ -156,7 +156,7 @@ namespace Catch {
|
||||
isSet = true;
|
||||
stack_t sigStack;
|
||||
sigStack.ss_sp = altStackMem;
|
||||
- sigStack.ss_size = SIGSTKSZ;
|
||||
+ sigStack.ss_size = 32768;
|
||||
sigStack.ss_flags = 0;
|
||||
sigaltstack(&sigStack, &oldSigStack);
|
||||
struct sigaction sa = { 0 };
|
||||
@@ -188,7 +188,7 @@ namespace Catch {
|
||||
bool FatalConditionHandler::isSet = false;
|
||||
struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
|
||||
stack_t FatalConditionHandler::oldSigStack = {};
|
||||
- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
|
||||
+ char FatalConditionHandler::altStackMem[32768] = {};
|
||||
|
||||
|
||||
} // namespace Catch
|
||||
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
|
||||
index fdb046fe..d64fd1a5 100644
|
||||
--- a/single_include/catch.hpp
|
||||
+++ b/single_include/catch.hpp
|
||||
@@ -6540,7 +6540,7 @@ namespace Catch {
|
||||
static bool isSet;
|
||||
static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
|
||||
static stack_t oldSigStack;
|
||||
- static char altStackMem[SIGSTKSZ];
|
||||
+ static char altStackMem[32768];
|
||||
|
||||
static void handleSignal( int sig ) {
|
||||
std::string name = "<unknown signal>";
|
||||
@@ -6560,7 +6560,7 @@ namespace Catch {
|
||||
isSet = true;
|
||||
stack_t sigStack;
|
||||
sigStack.ss_sp = altStackMem;
|
||||
- sigStack.ss_size = SIGSTKSZ;
|
||||
+ sigStack.ss_size = 32768;
|
||||
sigStack.ss_flags = 0;
|
||||
sigaltstack(&sigStack, &oldSigStack);
|
||||
struct sigaction sa = { 0 };
|
||||
@@ -6591,7 +6591,7 @@ namespace Catch {
|
||||
bool FatalConditionHandler::isSet = false;
|
||||
struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
|
||||
stack_t FatalConditionHandler::oldSigStack = {};
|
||||
- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
|
||||
+ char FatalConditionHandler::altStackMem[32768] = {};
|
||||
|
||||
} // namespace Catch
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
%global debug_package %{nil}
|
||||
|
||||
Name: catch1
|
||||
Version: 1.12.1
|
||||
Release: 1%{?dist}
|
||||
Version: 1.12.2
|
||||
Release: 19%{?dist}
|
||||
Summary: A modern, C++-native, header-only, framework for unit-tests, TDD and BDD
|
||||
|
||||
License: Boost
|
||||
URL: https://github.com/philsquared/Catch
|
||||
Source0: https://github.com/philsquared/Catch/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
License: BSL-1.0
|
||||
URL: https://github.com/catchorg/Catch2
|
||||
Source0: https://github.com/catchorg/Catch2/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
# https://github.com/catchorg/Catch2/issues/2178
|
||||
Patch0: catch1-sigstksz.patch
|
||||
|
||||
BuildRequires: cmake make gcc-c++
|
||||
|
||||
@ -21,7 +23,6 @@ is packaged up as a single header for extra convenience.
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Provides: %{name}-static = %{version}-%{release}
|
||||
Conflicts: catch-devel
|
||||
|
||||
%description devel
|
||||
Catch stands for C++ Automated Test Cases in Headers and is a
|
||||
@ -35,8 +36,8 @@ is packaged up as a single header for extra convenience.
|
||||
|
||||
|
||||
%build
|
||||
%cmake . -Bbuild
|
||||
%make_build -Cbuild
|
||||
%cmake
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
@ -45,8 +46,7 @@ cp -pr include %{buildroot}%{_includedir}/catch
|
||||
|
||||
|
||||
%check
|
||||
cd build
|
||||
ctest -V %{?_smp_mflags}
|
||||
%ctest
|
||||
|
||||
|
||||
%files devel
|
||||
@ -56,6 +56,65 @@ ctest -V %{?_smp_mflags}
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.12.2-19
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Thu Aug 15 2024 Attila Lakatos <alakatos@redhat.com> - 1.12.2-18
|
||||
- Rebuild
|
||||
Resolves: RHEL-54347
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.12.2-17
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Feb 22 2023 Tom Hughes <tom@compton.nu> - 1.12.2-13
|
||||
- Drop unnecessary conflict with catch-devel
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Feb 19 2021 Tom Hughes <tom@compton.nu> - 1.12.2-8
|
||||
- Add patch for non-constant SIGSTKSZ
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue May 15 2018 Tom Hughes <tom@compton.nu> - 1.12.2-1
|
||||
- Update to 1.12.2 upstream release
|
||||
|
||||
* Sat Mar 3 2018 Tom Hughes <tom@compton.nu> - 1.12.1-1
|
||||
- Update to 1.12.1 upstream release
|
||||
|
||||
13
ci.fmf
Normal file
13
ci.fmf
Normal file
@ -0,0 +1,13 @@
|
||||
|
||||
/e2e_ci:
|
||||
plan:
|
||||
import:
|
||||
url: https://github.com/RedHat-SP-Security/catch1-plans.git
|
||||
name: /generic/e2e_ci
|
||||
|
||||
/rpmverify:
|
||||
plan:
|
||||
import:
|
||||
url: https://github.com/RedHat-SP-Security/catch1-plans.git
|
||||
name: /generic/rpmverify
|
||||
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
Loading…
Reference in New Issue
Block a user