Upgrade to Ruby 2.2.0 (rc1).

This commit is contained in:
Vít Ondruch 2014-12-19 15:10:53 +01:00
commit 7097d0fbcc
3 changed files with 61 additions and 4 deletions

View file

@ -0,0 +1,13 @@
diff --git a/test/test_weakref.rb b/test/test_weakref.rb
index 36b5d5b..861457f 100644
--- a/test/test_weakref.rb
+++ b/test/test_weakref.rb
@@ -63,7 +63,7 @@ class TestWeakRef < Test::Unit::TestCase
def test_repeated_object_leak
bug10537 = '[ruby-core:66428]'
- assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537)
+ assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537, timeout: 30)
a = Object.new
150_000.times { WeakRef.new(a) }
end;

View file

@ -0,0 +1,36 @@
From a7fe780482b42b31c725f6c54bb1c27909714ab3 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Dec 2014 02:52:17 +0000
Subject: [PATCH] * test/ruby/test_rubyoptions.rb
(TestRubyOptions#test_version): should support rc :-P
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
test/ruby/test_rubyoptions.rb | 4 +-
1 file changed, 2 insertion(+), 2 deletion(-)
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 9150806..2bd1a30 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -85,7 +85,7 @@ class TestRubyOptions < Test::Unit::TestCase
def test_verbose
assert_in_out_err(["-vve", ""]) do |r, e|
- assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join)
+ assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join)
assert_equal RUBY_DESCRIPTION, r.join.chomp
assert_equal([], e)
end
@@ -139,7 +139,7 @@ class TestRubyOptions < Test::Unit::TestCase
def test_version
assert_in_out_err(%w(--version)) do |r, e|
- assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join)
+ assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join)
assert_equal RUBY_DESCRIPTION, r.join.chomp
assert_equal([], e)
end
--
2.1.0

View file

@ -7,7 +7,7 @@
%global ruby_release %{ruby_version}
# Specify the named version. It has precedense to revision.
#%%global milestone preview2
%global milestone rc1
# Keep the revision enabled for pre-releases from SVN.
%global revision 48879
@ -64,7 +64,7 @@ Group: Development/Languages
# Public Domain for example for: include/ruby/st.h, strftime.c, ...
License: (Ruby or BSD) and Public Domain
URL: http://ruby-lang.org/
Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.bz2
Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.xz
Source1: operating_system.rb
# TODO: Try to push SystemTap support upstream.
Source2: libruby.stp
@ -107,6 +107,12 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch
# in support for ABRT.
# http://bugs.ruby-lang.org/issues/8566
Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
# Fix TestRubyOptions#test_version failure for RC1.
# https://github.com/ruby/ruby/commit/a7fe780482b42b31c725f6c54bb1c27909714ab3
Patch7: ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch
# Fix TestWeakRef#test_repeated_object_leak failure on ARM.
# https://bugs.ruby-lang.org/issues/10618
Patch8: ruby-2.2.0-Extend-weak-ref-test-timeout.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(rubygems) >= %{rubygems_version}
@ -401,6 +407,8 @@ rm -rf ext/psych/yaml
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
# Provide an example of usage of the tapset:
cp -a %{SOURCE3} .
@ -880,8 +888,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Mon Nov 10 2014 Vít Ondruch <vondruch@redhat.com> - 2.2.0-0.1.r48879
- Upgrade to Ruby 2.2.0 (r48879).
* Mon Nov 10 2014 Vít Ondruch <vondruch@redhat.com> - 2.2.0-0.1.rc1
- Upgrade to Ruby 2.2.0 (rc1).
- Explicitly list RubyGems directories to avoid accidentaly packaged content.
- Split test-unit and power_assert gems into separate sub-packages.
- Drop libdb dependency in favor of gdbm.