Skip test_str_crypt (on rawhide) for now (upstream bug 7312)

This commit is contained in:
Mamoru Tasaka 2012-11-11 00:03:25 +09:00
parent 7eabfd2d54
commit e546e8e8c8
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,14 @@
--- ruby-1.9.3-p327/test/ruby/test_m17n_comb.rb.save 2011-02-15 16:08:15.000000000 +0900
+++ ruby-1.9.3-p327/test/ruby/test_m17n_comb.rb 2012-11-10 23:56:58.000000000 +0900
@@ -777,6 +777,11 @@
end
def test_str_crypt
+ begin
+ a("").crypt(a("\xa1\xa1"))
+ rescue ArgumentError
+ skip 'http://bugs.ruby-lang.org/issues/show/7312'
+ end
combination(STRINGS, STRINGS) {|str, salt|
if a(salt).length < 2
assert_raise(ArgumentError) { str.crypt(salt) }

View File

@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level}
# we cannot reset the release number to 1 even when the main (ruby) version # we cannot reset the release number to 1 even when the main (ruby) version
# is updated - because it may be that the versions of sub-components don't # is updated - because it may be that the versions of sub-components don't
# change. # change.
Release: 22%{?dist} Release: 23%{?dist}
Group: Development/Languages Group: Development/Languages
# Public Domain for example for: include/ruby/st.h, strftime.c, ... # Public Domain for example for: include/ruby/st.h, strftime.c, ...
License: (Ruby or BSD) and Public Domain License: (Ruby or BSD) and Public Domain
@ -94,6 +94,9 @@ Patch9: rubygems-1.8.11-binary-extensions.patch
# On koji, network related tests sometimes cause internal server error, # On koji, network related tests sometimes cause internal server error,
# ignore these # ignore these
Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch
# http://bugs.ruby-lang.org/issues/show/7312
# test_str_crypt fails with glibc 2.17
Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch
# Make mkmf verbose by default # Make mkmf verbose by default
Patch12: ruby-1.9.3-mkmf-verbose.patch Patch12: ruby-1.9.3-mkmf-verbose.patch
@ -336,6 +339,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%patch12 -p1 %patch12 -p1
%build %build
@ -742,6 +746,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Sun Nov 11 2012 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.327-23
- Skip test_str_crypt (on rawhide) for now (upstream bug 7312)
* Sat Nov 10 2012 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.327-22 * Sat Nov 10 2012 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.327-22
- Ignore some network related tests - Ignore some network related tests