rpms/R-testthat
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply change from Fedora catch1 package to fix issue in rawhide where SIGSTKSZ is no longer a constant

Browse Source
This commit is contained in:
Tom spot Callaway 2021-03-08 13:46:42 -05:00
parent 335487079b
commit e56b50d1cd
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
R-testthat-sigstksz-not-constant.patch Normal file
View File

@ -0,0 +1,30 @@
diff -up testthat/testthat/inst/include/testthat/vendor/catch.h.sigstksz-not-constant testthat/testthat/inst/include/testthat/vendor/catch.h
--- testthat/testthat/inst/include/testthat/vendor/catch.h.sigstksz-not-constant 2021-03-08 13:42:10.853651874 -0500
+++ testthat/testthat/inst/include/testthat/vendor/catch.h 2021-03-08 13:42:36.079767324 -0500
@@ -6492,7 +6492,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>";
@@ -6512,7 +6512,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 };
@@ -6543,7 +6543,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

7
R-testthat.spec
View File

@ -7,8 +7,9 @@
Name: R-%{packname} Name: R-%{packname}
Version: %{packver} Version: %{packver}
Release: 1%{?dist} Release: 2%{?dist}
Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{packver}.tar.gz Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{packver}.tar.gz
Patch0: R-testthat-sigstksz-not-constant.patch
License: MIT License: MIT
URL: https://cran.r-project.org/package=testthat URL: https://cran.r-project.org/package=testthat
Summary: Unit Testing for R Summary: Unit Testing for R
@ -54,6 +55,7 @@ A unit testing system designed to be fun, flexible, and easy to set up.
%prep %prep
%setup -q -c -n %{packname} %setup -q -c -n %{packname}
%patch0 -p1 -b .sigstksz-not-constant
# Don't need coverage; it's not packaged either. # Don't need coverage; it's not packaged either.
sed -i 's/covr, //g' %{packname}/DESCRIPTION sed -i 's/covr, //g' %{packname}/DESCRIPTION
@ -92,6 +94,9 @@ export _R_CHECK_FORCE_SUGGESTS_=0 LANG=C.UTF-8
%{_libdir}/R/library/%{packname}/include/ %{_libdir}/R/library/%{packname}/include/
%changelog %changelog
* Mon Mar 8 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.2-2
- apply change from Fedora catch1 package to fix issue in rawhide where SIGSTKSZ is no longer a constant
* Mon Feb 15 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.2-1 * Mon Feb 15 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.2-1
- update to 3.0.2 - update to 3.0.2