Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ad2778322 |
2 changed files with 37 additions and 1 deletions
28
rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch
Normal file
28
rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
From 02e44fa481d5061c95d5332a91bcf7143b582bc8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jon Rowe <hello@jonrowe.co.uk>
|
||||||
|
Date: Sat, 10 Dec 2022 11:25:15 +1100
|
||||||
|
Subject: [PATCH] Pend broken spec on Ruby 3.1.3, skip on CI for Ruby head
|
||||||
|
|
||||||
|
---
|
||||||
|
spec/rspec/support/reentrant_mutex_spec.rb | 8 +++++++-
|
||||||
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/spec/rspec/support/reentrant_mutex_spec.rb b/spec/rspec/support/reentrant_mutex_spec.rb
|
||||||
|
index 9bef54ee..c8a41c1e 100644
|
||||||
|
--- a/spec/rspec/support/reentrant_mutex_spec.rb
|
||||||
|
+++ b/spec/rspec/support/reentrant_mutex_spec.rb
|
||||||
|
@@ -28,7 +28,13 @@
|
||||||
|
order.join_all
|
||||||
|
end
|
||||||
|
|
||||||
|
- if RUBY_VERSION >= '3.0'
|
||||||
|
+ # On Ruby 3.1.3 and RUBY_HEAD the raise in this spec can
|
||||||
|
+ # bypass the `raise_error` capture and break this spec but
|
||||||
|
+ # it is not sufficient to pend it as the raise can escape to the other
|
||||||
|
+ # threads somehow therefore poisoning them so its skipped entirely.
|
||||||
|
+ # This is a temporary work around to allow green cross project builds but
|
||||||
|
+ # needs a fix.
|
||||||
|
+ if RUBY_VERSION >= '3.0' && RUBY_VERSION < '3.1.3'
|
||||||
|
it 'waits when trying to lock from another Fiber' do
|
||||||
|
mutex.synchronize do
|
||||||
|
ready = false
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
%global mainver 3.11.1
|
%global mainver 3.11.1
|
||||||
%undefine prever
|
%undefine prever
|
||||||
|
|
||||||
%global mainrel 1
|
%global mainrel 2
|
||||||
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
|
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
|
||||||
|
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
|
|
@ -21,6 +21,10 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem
|
||||||
# %%{SOURCE2} %%{name} %%{version}
|
# %%{SOURCE2} %%{name} %%{version}
|
||||||
Source1: rubygem-%{gem_name}-%{version}-full.tar.gz
|
Source1: rubygem-%{gem_name}-%{version}-full.tar.gz
|
||||||
Source2: rspec-related-create-full-tarball.sh
|
Source2: rspec-related-create-full-tarball.sh
|
||||||
|
# https://github.com/rspec/rspec-support/pull/556
|
||||||
|
# ruby 3.2.0 / 3.1.3 changes fiber deadlock treatment
|
||||||
|
# Tweaked to make test suite flexible
|
||||||
|
Patch0: rubygem-rspec-support-3.12.0-pend-lock-fiber-test.patch
|
||||||
# tweak regex for search path
|
# tweak regex for search path
|
||||||
Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch
|
Patch100: rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch
|
||||||
|
|
||||||
|
|
@ -58,6 +62,7 @@ Documentation for %{name}
|
||||||
%setup -q -T -n %{gem_name}-%{version} -b 1
|
%setup -q -T -n %{gem_name}-%{version} -b 1
|
||||||
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
|
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
%patch100 -p1
|
%patch100 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
@ -106,6 +111,9 @@ rspec spec/ || rspec --tag ~broken
|
||||||
%doc %{gem_docdir}
|
%doc %{gem_docdir}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 10 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.1-2
|
||||||
|
- Backport upstrem patch for pending broken test with ruby >= 3.1.3
|
||||||
|
|
||||||
* Thu Sep 15 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.1-1
|
* Thu Sep 15 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.11.1-1
|
||||||
- 3.11.1
|
- 3.11.1
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue